Improve encapsulation in the Loop and LoopInfo classes by eliminating the

getSubLoops/getTopLevelLoops methods, replacing them with iterator-based
accessors.


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

include/llvm/Analysis/LoopInfo.h

@@ -56,9 +56,11 @@ public:
   /// contains - Return true of the specified basic block is in this loop
   bool contains(const BasicBlock *BB) const;
 
-  /// getSubLoops - Return the loops contained entirely within this loop
+  /// iterator/begin/end - Return the loops contained entirely within this loop.
   ///
-  const std::vector<Loop*> &getSubLoops() const { return SubLoops; }
+  typedef std::vector<Loop*>::const_iterator iterator;
+  iterator begin() const { return SubLoops.begin(); }
+  iterator end() const { return SubLoops.end(); }
 
   /// getBlocks - Get a list of the basic blocks which make up this loop.
   ///
@@ -147,7 +149,12 @@ class LoopInfo : public FunctionPass {
 public:
   ~LoopInfo() { releaseMemory(); }
 
-  const std::vector<Loop*> &getTopLevelLoops() const { return TopLevelLoops; }
+  /// iterator/begin/end - The interface to the top-level loops in the current
+  /// function.
+  ///
+  typedef std::vector<Loop*>::const_iterator iterator;
+  iterator begin() const { return TopLevelLoops.begin(); }
+  iterator end() const { return TopLevelLoops.end(); }
 
   /// getLoopFor - Return the inner most loop that BB lives in.  If a basic
   /// block is in no loop (for example the entry node), null is returned.
@@ -206,10 +213,10 @@ template <> struct GraphTraits<const Loop*> {
 
   static NodeType *getEntryNode(const Loop *L) { return L; }
   static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->getSubLoops().begin();
+    return N->begin();
   }
   static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->getSubLoops().end();
+    return N->end();
   }
 };
 
@@ -219,10 +226,10 @@ template <> struct GraphTraits<Loop*> {
 
   static NodeType *getEntryNode(Loop *L) { return L; }
   static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->getSubLoops().begin();
+    return N->begin();
   }
   static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->getSubLoops().end();
+    return N->end();
   }
 };
 

lib/Analysis/LoopInfo.cpp

@@ -72,8 +72,8 @@ void Loop::print(std::ostream &OS, unsigned Depth) const {
 
   OS << "\n";
 
-  for (unsigned i = 0, e = getSubLoops().size(); i != e; ++i)
+  for (iterator I = begin(), E = end(); I != E; ++I)
-    getSubLoops()[i]->print(OS, Depth+2);
+    (*I)->print(OS, Depth+2);
 }
 
 void Loop::dump() const {

lib/Transforms/Scalar/IndVarSimplify.cpp

@@ -43,8 +43,8 @@ namespace {
       Changed = false;
 
       // Induction Variables live in the header nodes of loops
-      for (unsigned i = 0, e = Loops->getTopLevelLoops().size(); i != e; ++i)
+      for (LoopInfo::iterator I = Loops->begin(), E = Loops->end(); I != E; ++I)
-        runOnLoop(Loops->getTopLevelLoops()[i]);
+        runOnLoop(*I);
       return Changed;
     }
 
@@ -77,8 +77,8 @@ Pass *llvm::createIndVarSimplifyPass() {
 
 void IndVarSimplify::runOnLoop(Loop *Loop) {
   // Transform all subloops before this loop...
-  for (unsigned i = 0, e = Loop->getSubLoops().size(); i != e; ++i)
+  for (LoopInfo::iterator I = Loop->begin(), E = Loop->end(); I != E; ++I)
-    runOnLoop(Loop->getSubLoops()[i]);
+    runOnLoop(*I);
 
   // Get the header node for this loop.  All of the phi nodes that could be
   // induction variables must live in this basic block.

lib/Transforms/Scalar/LICM.cpp

@@ -113,8 +113,8 @@ namespace {
     ///
     bool inSubLoop(BasicBlock *BB) {
       assert(CurLoop->contains(BB) && "Only valid if BB is IN the loop");
-      for (unsigned i = 0, e = CurLoop->getSubLoops().size(); i != e; ++i)
+      for (Loop::iterator I = CurLoop->begin(), E = CurLoop->end(); I != E; ++I)
-        if (CurLoop->getSubLoops()[i]->contains(BB))
+        if ((*I)->contains(BB))
           return true;  // A subloop actually contains this block!
       return false;
     }
@@ -221,9 +221,7 @@ bool LICM::runOnFunction(Function &) {
   DT = &getAnalysis<DominatorTree>();
 
   // Hoist expressions out of all of the top-level loops.
-  const std::vector<Loop*> &TopLevelLoops = LI->getTopLevelLoops();
+  for (LoopInfo::iterator I = LI->begin(), E = LI->end(); I != E; ++I) {
-  for (std::vector<Loop*>::const_iterator I = TopLevelLoops.begin(),
-         E = TopLevelLoops.end(); I != E; ++I) {
     AliasSetTracker AST(*AA);
     visitLoop(*I, AST);
   }
@@ -235,8 +233,7 @@ bool LICM::runOnFunction(Function &) {
 ///
 void LICM::visitLoop(Loop *L, AliasSetTracker &AST) {
   // Recurse through all subloops before we process this loop...
-  for (std::vector<Loop*>::const_iterator I = L->getSubLoops().begin(),
+  for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I) {
-         E = L->getSubLoops().end(); I != E; ++I) {
     AliasSetTracker SubAST(*AA);
     visitLoop(*I, SubAST);
 

lib/Transforms/Utils/LoopSimplify.cpp

@@ -91,8 +91,8 @@ bool LoopSimplify::runOnFunction(Function &F) {
   bool Changed = false;
   LoopInfo &LI = getAnalysis<LoopInfo>();
 
-  for (unsigned i = 0, e = LI.getTopLevelLoops().size(); i != e; ++i)
+  for (LoopInfo::iterator I = LI.begin(), E = LI.end(); I != E; ++I)
-    Changed |= ProcessLoop(LI.getTopLevelLoops()[i]);
+    Changed |= ProcessLoop(*I);
 
   return Changed;
 }
@@ -136,9 +136,8 @@ bool LoopSimplify::ProcessLoop(Loop *L) {
     Changed = true;
   }
 
-  const std::vector<Loop*> &SubLoops = L->getSubLoops();
+  for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I)
-  for (unsigned i = 0, e = SubLoops.size(); i != e; ++i)
+    Changed |= ProcessLoop(*I);
-    Changed |= ProcessLoop(SubLoops[i]);
   return Changed;
 }
 
@@ -227,9 +226,8 @@ BasicBlock *LoopSimplify::SplitBlockPredecessors(BasicBlock *BB,
 static void ChangeExitBlock(Loop *L, BasicBlock *OldExit, BasicBlock *NewExit) {
   if (L->hasExitBlock(OldExit)) {
     L->changeExitBlock(OldExit, NewExit);
-    const std::vector<Loop*> &SubLoops = L->getSubLoops();
+    for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I)
-    for (unsigned i = 0, e = SubLoops.size(); i != e; ++i)
+      ChangeExitBlock(*I, OldExit, NewExit);
-      ChangeExitBlock(SubLoops[i], OldExit, NewExit);
   }
 }
 
@@ -266,16 +264,19 @@ void LoopSimplify::InsertPreheaderForLoop(Loop *L) {
   // is a sibling loop, ie, one with the same parent loop, or one if it's
   // children.
   //
-  const std::vector<Loop*> *ParentSubLoops;
+  LoopInfo::iterator ParentLoops, ParentLoopsE;
-  if (Loop *Parent = L->getParentLoop())
+  if (Loop *Parent = L->getParentLoop()) {
-    ParentSubLoops = &Parent->getSubLoops();
+    ParentLoops = Parent->begin();
-  else       // Must check top-level loops...
+    ParentLoopsE = Parent->end();
-    ParentSubLoops = &getAnalysis<LoopInfo>().getTopLevelLoops();
+  } else {      // Must check top-level loops...
+    ParentLoops = getAnalysis<LoopInfo>().begin();
+    ParentLoopsE = getAnalysis<LoopInfo>().end();
+  }
 
   // Loop over all sibling loops, performing the substitution (recursively to
   // include child loops)...
-  for (unsigned i = 0, e = ParentSubLoops->size(); i != e; ++i)
+  for (; ParentLoops != ParentLoopsE; ++ParentLoops)
-    ChangeExitBlock((*ParentSubLoops)[i], Header, NewBB);
+    ChangeExitBlock(*ParentLoops, Header, NewBB);
   
   DominatorSet &DS = getAnalysis<DominatorSet>();  // Update dominator info
   {