diff options
| -rw-r--r-- | llvm/lib/Transforms/Utils/LowerInvoke.cpp | 11 | ||||
| -rw-r--r-- | llvm/test/Transforms/LowerInvoke/2008-02-14-CritEdgePhiCrash.ll | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Utils/LowerInvoke.cpp b/llvm/lib/Transforms/Utils/LowerInvoke.cpp index 39738a09ba7..920a0286ead 100644 --- a/llvm/lib/Transforms/Utils/LowerInvoke.cpp +++ b/llvm/lib/Transforms/Utils/LowerInvoke.cpp @@ -256,6 +256,17 @@ void LowerInvoke::rewriteExpensiveInvoke(InvokeInst *II, unsigned InvokeNo, SwitchInst *CatchSwitch) { ConstantInt *InvokeNoC = ConstantInt::get(Type::Int32Ty, InvokeNo); + // If the unwind edge has phi nodes, split the edge. + if (isa<PHINode>(II->getUnwindDest()->begin())) { + SplitCriticalEdge(II, 1, this); + + // If there are any phi nodes left, they must have a single predecessor. + while (PHINode *PN = dyn_cast<PHINode>(II->getUnwindDest()->begin())) { + PN->replaceAllUsesWith(PN->getIncomingValue(0)); + PN->eraseFromParent(); + } + } + // Insert a store of the invoke num before the invoke and store zero into the // location afterward. new StoreInst(InvokeNoC, InvokeNum, true, II); // volatile diff --git a/llvm/test/Transforms/LowerInvoke/2008-02-14-CritEdgePhiCrash.ll b/llvm/test/Transforms/LowerInvoke/2008-02-14-CritEdgePhiCrash.ll new file mode 100644 index 00000000000..fa825398653 --- /dev/null +++ b/llvm/test/Transforms/LowerInvoke/2008-02-14-CritEdgePhiCrash.ll @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s | opt -lowerinvoke -enable-correct-eh-support -disable-output +; PR2029 +define i32 @main(i32 %argc, i8** %argv) { +bb470: + invoke i32 @main(i32 0, i8** null) to label %invcont474 unwind label +%lpad902 + +invcont474: ; preds = %bb470 + ret i32 0 + +lpad902: ; preds = %bb470 + %tmp471.lcssa = phi i8* [ null, %bb470 ] ; <i8*> + ret i32 0 +} |
