aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Transforms/Utils
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
commitddf4d8ef3afc0334e29351730748cda0ab92f9d0 (patch)
tree78d126f0e3bb29da0bd5f4738640b9a303ecf06c /lib/Transforms/Utils
parent40c70bb1f6b69fa1ac615387584d338442017e2e (diff)
downloadexternal_llvm-ddf4d8ef3afc0334e29351730748cda0ab92f9d0.zip
external_llvm-ddf4d8ef3afc0334e29351730748cda0ab92f9d0.tar.gz
external_llvm-ddf4d8ef3afc0334e29351730748cda0ab92f9d0.tar.bz2
Add some checks that got lost in the shuffle. This fixes 464.h264ref.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53760 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils')
-rw-r--r--lib/Transforms/Utils/BasicBlockUtils.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp
index d889422..719bc8a 100644
--- a/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/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;