diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-01-14 21:01:16 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-01-14 21:01:16 +0000 |
| commit | d9d46241ece12351fce06b55baad2c83b50922a6 (patch) | |
| tree | ac3c07b17ce2fe308142012d9033743588d4749d | |
| parent | 37315759b4d8f11c2405bea095899a953771114e (diff) | |
Fix PR3325, a miscompilation of invokes by IPSCCP. Patch by Jay Foad!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62244 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Scalar/SCCP.cpp | 5 | ||||
| -rw-r--r-- | test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll | 28 |
2 files changed, 30 insertions, 3 deletions
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index 954bc0011e..dfb4795459 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -1749,8 +1749,7 @@ bool IPSCCP::runOnModule(Module &M) { } else { for (BasicBlock::iterator BI = BB->begin(), E = BB->end(); BI != E; ) { Instruction *Inst = BI++; - if (Inst->getType() == Type::VoidTy || - isa<TerminatorInst>(Inst)) + if (Inst->getType() == Type::VoidTy) continue; LatticeVal &IV = Values[Inst]; @@ -1766,7 +1765,7 @@ bool IPSCCP::runOnModule(Module &M) { Inst->replaceAllUsesWith(Const); // Delete the instruction. - if (!isa<CallInst>(Inst)) + if (!isa<CallInst>(Inst) && !isa<TerminatorInst>(Inst)) Inst->eraseFromParent(); // Hey, we just changed something! diff --git a/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll b/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll new file mode 100644 index 0000000000..20f7c21b7c --- /dev/null +++ b/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll @@ -0,0 +1,28 @@ +; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep {ret i32 42} +; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep {ret i32 undef} +; PR3325 + +define i32 @main() { + %tmp1 = invoke i32 @f() + to label %UnifiedReturnBlock unwind label %lpad + +lpad: + unreachable + +UnifiedReturnBlock: + ret i32 %tmp1 +} + +define internal i32 @f() { + ret i32 42 +} + +declare i8* @__cxa_begin_catch(i8*) nounwind + +declare i8* @llvm.eh.exception() nounwind + +declare i32 @llvm.eh.selector.i32(i8*, i8*, ...) nounwind + +declare void @__cxa_end_catch() + +declare i32 @__gxx_personality_v0(...) |