diff options
author | Evan Cheng <evan.cheng@apple.com> | 2012-04-24 19:06:55 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2012-04-24 19:06:55 +0000 |
commit | ddb1420e1752a354a2a18dfc37ecca7eef883beb (patch) | |
tree | 2b4a3a0d4901ffd98b0ad01913dc6940a88e041d /lib/CodeGen/MachineBasicBlock.cpp | |
parent | 1d9e68dab1fc29e3a5e05a3b0b8d7c70de5e10b2 (diff) |
MachineBasicBlock::SplitCriticalEdge() should follow LLVM IR variant and refuse to break edge to EH landing pad. rdar://11300144
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155470 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/MachineBasicBlock.cpp')
-rw-r--r-- | lib/CodeGen/MachineBasicBlock.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp index 1abb8f240c..cf885251d6 100644 --- a/lib/CodeGen/MachineBasicBlock.cpp +++ b/lib/CodeGen/MachineBasicBlock.cpp @@ -596,6 +596,11 @@ bool MachineBasicBlock::canFallThrough() { MachineBasicBlock * MachineBasicBlock::SplitCriticalEdge(MachineBasicBlock *Succ, Pass *P) { + // Splitting the critical edge to a landing pad block is non-trivial. Don't do + // it in this generic function. + if (Succ->isLandingPad()) + return NULL; + MachineFunction *MF = getParent(); DebugLoc dl; // FIXME: this is nowhere |