* Pull BasicBlock::pred_* and BasicBlock::succ_* out of BasicBlock.h and into

  llvm/Support/CFG.h
* Make pred & succ iterators for intervals global functions


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1748 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 29 insertions, 20 deletions

diff --git a/include/llvm/Analysis/Interval.h b/include/llvm/Analysis/Interval.h
index 18f3a88c7e..5fdb71dc38 100644
--- a/include/llvm/Analysis/Interval.h
+++ b/include/llvm/Analysis/Interval.h
@@ -87,21 +87,29 @@ public:
 
   // isLoop - Find out if there is a back edge in this interval...
   bool isLoop() const;
+};
 
+}    // End namespace cfg
 
-  // succ_begin/succ_end - define methods so that Intervals may be used
-  // just like BasicBlocks can with the succ_* functions, and *::succ_iterator.
-  //
-  inline succ_iterator succ_begin() { return Successors.begin(); }
-  inline succ_iterator succ_end()   { return Successors.end(); }
+// succ_begin/succ_end - define methods so that Intervals may be used
+// just like BasicBlocks can with the succ_* functions, and *::succ_iterator.
+//
+inline cfg::Interval::succ_iterator succ_begin(cfg::Interval *I) {
+  return I->Successors.begin();
+}
+inline cfg::Interval::succ_iterator succ_end(cfg::Interval *I)   {
+  return I->Successors.end();
+}
   
-  // pred_begin/pred_end - define methods so that Intervals may be used
-  // just like BasicBlocks can with the pred_* functions, and *::pred_iterator.
-  //
-  inline Interval::pred_iterator pred_begin() { return Predecessors.begin(); }
-  inline Interval::pred_iterator pred_end()   { return Predecessors.end(); }
-};
+// pred_begin/pred_end - define methods so that Intervals may be used
+// just like BasicBlocks can with the pred_* functions, and *::pred_iterator.
+//
+inline cfg::Interval::pred_iterator pred_begin(cfg::Interval *I) {
+  return I->Predecessors.begin();
+}
+inline cfg::Interval::pred_iterator pred_end(cfg::Interval *I)   {
+  return I->Predecessors.end();
+}
 
-}    // End namespace cfg
 
 #endif
diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h
index 05add884fd..3c27f1ae8b 100644
--- a/include/llvm/Analysis/IntervalIterator.h
+++ b/include/llvm/Analysis/IntervalIterator.h
@@ -29,6 +29,7 @@
 #include "llvm/Analysis/IntervalPartition.h"
 #include "llvm/Method.h"
 #include "llvm/BasicBlock.h"
+#include "llvm/Support/CFG.h"
 #include <stack>
 #include <set>
 #include <algorithm>
@@ -128,7 +129,7 @@ public:
       // All of the intervals on the stack have been visited.  Try visiting
       // their successors now.
       Interval::succ_iterator &SuccIt = IntStack.top().second,
-	                        EndIt = IntStack.top().first->succ_end();
+	                        EndIt = succ_end(IntStack.top().first);
       while (SuccIt != EndIt) {                 // Loop over all interval succs
 	bool Done = ProcessInterval(getSourceGraphNode(OrigContainer, *SuccIt));
 	++SuccIt;                               // Increment iterator
@@ -165,11 +166,11 @@ private:
     Visited.insert(Header);   // The header has now been visited!
 
     // Check all of our successors to see if they are in the interval...
-    for (typename NodeTy::succ_iterator I = Node->succ_begin(),
-                                        E = Node->succ_end(); I != E; ++I)
+    for (typename NodeTy::succ_iterator I = succ_begin(Node),
+                                        E = succ_end(Node); I != E; ++I)
       ProcessNode(Int, getSourceGraphNode(OrigContainer, *I));
 
-    IntStack.push(make_pair(Int, Int->succ_begin()));
+    IntStack.push(make_pair(Int, succ_begin(Int)));
     return true;
   }
   
@@ -196,8 +197,8 @@ private:
 	  Int->Successors.push_back(NodeHeader);
       }
     } else {                             // Otherwise, not in interval yet
-      for (typename NodeTy::pred_iterator I = Node->pred_begin(), 
-	                                  E = Node->pred_end(); I != E; ++I) {
+      for (typename NodeTy::pred_iterator I = pred_begin(Node), 
+	                                  E = pred_end(Node); I != E; ++I) {
 	if (!Int->contains(*I)) {        // If pred not in interval, we can't be
 	  if (!Int->isSuccessor(NodeHeader)) // Add only if not already in set
 	    Int->Successors.push_back(NodeHeader);
@@ -219,8 +220,8 @@ private:
     
       // Now that we have discovered that Node is in the interval, perhaps some
       // of its successors are as well?
-      for (typename NodeTy::succ_iterator It = Node->succ_begin(), 
-	     End = Node->succ_end(); It != End; ++It)
+      for (typename NodeTy::succ_iterator It = succ_begin(Node),
+	     End = succ_end(Node); It != End; ++It)
 	ProcessNode(Int, getSourceGraphNode(OrigContainer, *It));
     }
   }