summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2008-07-18 17:46:41 +0000
committerOwen Anderson <resistor@mac.com>2008-07-18 17:46:41 +0000
commit1468bec06e92fa040bbb7e7443fc0daadffb7234 (patch)
tree9d7b5747e74843fd14bb14834a217f9b0be4708a /llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
parentf7faa42c6c19a1da9320cfbc759dfd3222994cc3 (diff)
downloadbcm5719-llvm-1468bec06e92fa040bbb7e7443fc0daadffb7234.tar.gz
bcm5719-llvm-1468bec06e92fa040bbb7e7443fc0daadffb7234.zip
Add some checks that got lost in the shuffle. This fixes 464.h264ref.
llvm-svn: 53760
Diffstat (limited to 'llvm/lib/Transforms/Utils/BasicBlockUtils.cpp')
-rw-r--r--llvm/lib/Transforms/Utils/BasicBlockUtils.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
index d889422992b..719bc8a34f8 100644
--- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -39,6 +39,10 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock* BB, Pass* P) {
// Can't merge if there are multiple predecessors.
if (!PredBB) return false;
+ // Don't break self-loops.
+ if (PredBB == BB) return false;
+ // Don't break invokes.
+ if (isa<InvokeInst>(PredBB->getTerminator())) return false;
succ_iterator SI(succ_begin(PredBB)), SE(succ_end(PredBB));
BasicBlock* OnlySucc = BB;
OpenPOWER on IntegriCloud