Move break-crit-edges before the predicate simplifier. Allows us to

optimize in more cases.

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

diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp
index 715818c686156c2f690dbd2812c32ede15c3d84f..b6de61bacd165707999bbebd0ea499bd8aa0e1fe 100644 (file)
--- a/lib/Transforms/Scalar/PredicateSimplifier.cpp
+++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp
@@ -500,8 +500,10 @@ bool PredicateSimplifier::runOnFunction(Function &F) {
 }
 
 void PredicateSimplifier::getAnalysisUsage(AnalysisUsage &AU) const {
+  AU.addRequiredID(BreakCriticalEdgesID);
   AU.addRequired<DominatorTree>();
   AU.setPreservesCFG();
+  AU.addPreservedID(BreakCriticalEdgesID);
 }
 
 // resolve catches cases addProperty won't because it wasn't used as a
@@ -622,13 +624,7 @@ void PredicateSimplifier::proceedToSuccessor(TerminatorInst *TI,
                                              PropertySet &NextPS) {
   assert(edge < TI->getNumSuccessors() && "Invalid index for edge.");
 
-  BasicBlock *BB     = TI->getParent(),
-             *BBNext = TI->getSuccessor(edge);
-
-  if (BBNext->getSinglePredecessor() == BB)
-    visitBasicBlock(BBNext, NextPS);
-  else
-    visitBasicBlock(BBNext, CurrentPS);
+  visitBasicBlock(TI->getSuccessor(edge), NextPS);
 }
 
 void PredicateSimplifier::proceedToSuccessors(PropertySet &KP,

diff --git a/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll b/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
index b2462f992db3bafcdba9dfae89e6b24dd73b2971..67bc715c9189e823a9e653e6fadbc6b17aa495c8 100644 (file)
--- a/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
+++ b/test/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -predsimplify | llvm-dis | grep br | grep bb8 | grep cond_true$ | grep false
+; RUN: llvm-as < %s | opt -predsimplify | llvm-dis | grep br | grep return.i.bb8_crit_edge | grep false
 
 %str = external global [4 x sbyte]             ; <[4 x sbyte]*> [#uses=1]