[llvm-commits] CVS: llvm/lib/Transforms/Utils/LoopSimplify.cpp

[Owen Anderson]

Changes in directory llvm/lib/Transforms/Utils:

LoopSimplify.cpp updated: 1.80 -> 1.81
---
Log message:

Expunge a bunch of uses of DomSet from LoopSimplify.  Many more remain.

This is the beginning of work for PR1171: http://llvm.org/PR1171 .


---
Diffs of the changes:  (+2 -3)

 LoopSimplify.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.80 llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.81
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.80	Tue Mar 20 15:18:12 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp	Fri Apr  6 23:37:14 2007
@@ -314,7 +314,7 @@
       // Can we eliminate this phi node now?
       if (Value *V = PN->hasConstantValue(true)) {
         if (!isa<Instruction>(V) ||
-            getAnalysis<DominatorSet>().dominates(cast<Instruction>(V), PN)) {
+            getAnalysis<ETForest>().dominates(cast<Instruction>(V), PN)) {
           PN->replaceAllUsesWith(V);
           if (AA) AA->deleteValue(PN);
           BB->getInstList().erase(PN);
@@ -542,10 +542,9 @@
 
   // Determine which blocks should stay in L and which should be moved out to
   // the Outer loop now.
-  DominatorSet &DS = getAnalysis<DominatorSet>();
   std::set<BasicBlock*> BlocksInL;
   for (pred_iterator PI = pred_begin(Header), E = pred_end(Header); PI!=E; ++PI)
-    if (DS.dominates(Header, *PI))
+    if (EF->dominates(Header, *PI))
       AddBlockAndPredsToSet(*PI, Header, BlocksInL);