From 51a6dbcb65706baae0462d6030f79d499cb6e148 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 2 May 2004 05:02:03 +0000 Subject: [PATCH] Do not infinitely "unroll" single BB loops. llvm-svn: 13315 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index a1b917ff3e91..a5153d65e320 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -804,12 +804,12 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { // If this basic block is ONLY a setcc and a branch, and if a predecessor // branches to us and one of our successors, fold the setcc into the // predecessor and use logical operations to pick the right destination. + BasicBlock *TrueDest = BI->getSuccessor(0); + BasicBlock *FalseDest = BI->getSuccessor(1); if (Instruction *Cond = dyn_cast(BI->getCondition())) if (Cond->getParent() == BB && &BB->front() == Cond && - Cond->getNext() == BI && Cond->hasOneUse()) { - BasicBlock *TrueDest = BI->getSuccessor(0); - BasicBlock *FalseDest = BI->getSuccessor(1); - + Cond->getNext() == BI && Cond->hasOneUse() && + TrueDest != BB && FalseDest != BB) for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI!=E; ++PI) if (BranchInst *PBI = dyn_cast((*PI)->getTerminator())) if (PBI->isConditional() && SafeToMergeTerminators(BI, PBI)) { @@ -853,7 +853,6 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { return SimplifyCFG(BB) | 1; } } - } // If this block ends with a branch instruction, and if there is one // predecessor, see if the previous block ended with a branch on the same