[llvm-commits] CVS: llvm/lib/Transforms/IPO/LoopExtractor.cpp

[Owen Anderson]

Changes in directory llvm/lib/Transforms/IPO:

LoopExtractor.cpp updated: 1.23 -> 1.24
---
Log message:

Expunge DomSet from CodeExtractor.  This is part of the continuing work 
on PR1171: http://llvm.org/PR1171 .


---
Diffs of the changes:  (+7 -5)

 LoopExtractor.cpp |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff -u llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.23 llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.24
--- llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.23	Mon Feb  5 17:32:05 2007
+++ llvm/lib/Transforms/IPO/LoopExtractor.cpp	Sat Apr  7 00:31:27 2007
@@ -43,7 +43,8 @@
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequiredID(BreakCriticalEdgesID);
       AU.addRequiredID(LoopSimplifyID);
-      AU.addRequired<DominatorSet>();
+      AU.addRequired<ETForest>();
+      AU.addRequired<DominatorTree>();
       AU.addRequired<LoopInfo>();
     }
   };
@@ -72,7 +73,8 @@
   if (LI.begin() == LI.end())
     return false;
 
-  DominatorSet &DS = getAnalysis<DominatorSet>();
+  ETForest &EF = getAnalysis<ETForest>();
+  DominatorTree &DT = getAnalysis<DominatorTree>();
 
   // If there is more than one top-level loop in this function, extract all of
   // the loops.
@@ -81,7 +83,7 @@
     for (LoopInfo::iterator i = LI.begin(), e = LI.end(); i != e; ++i) {
       if (NumLoops == 0) return Changed;
       --NumLoops;
-      Changed |= ExtractLoop(DS, *i) != 0;
+      Changed |= ExtractLoop(EF, DT, *i) != 0;
       ++NumExtracted;
     }
   } else {
@@ -111,7 +113,7 @@
     if (ShouldExtractLoop) {
       if (NumLoops == 0) return Changed;
       --NumLoops;
-      Changed |= ExtractLoop(DS, TLL) != 0;
+      Changed |= ExtractLoop(EF, DT, TLL) != 0;
       ++NumExtracted;
     } else {
       // Okay, this function is a minimal container around the specified loop.
@@ -121,7 +123,7 @@
       for (Loop::iterator i = TLL->begin(), e = TLL->end(); i != e; ++i) {
         if (NumLoops == 0) return Changed;
         --NumLoops;
-        Changed |= ExtractLoop(DS, *i) != 0;
+        Changed |= ExtractLoop(EF, DT, *i) != 0;
         ++NumExtracted;
       }
     }