diff options
| -rw-r--r-- | llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp | 10 | ||||
| -rw-r--r-- | llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp b/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp index 715818c6861..b6de61bacd1 100644 --- a/llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp +++ b/llvm/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/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll b/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll index b2462f992db..67bc715c918 100644 --- a/llvm/test/Regression/Transforms/PredicateSimplifier/2006-09-20-SetCC.ll +++ b/llvm/test/Regression/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] |
