maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix PR3325, a miscompilation of invokes by IPSCCP. Patch by Jay Foad! 

llvm-svn: 62244
This commit is contained in:
Chris Lattner 2009-01-14 21:01:16 +00:00
parent 08e5e62f98
commit 8fb9480ed2
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Transforms/Scalar/SCCP.cpp
View File

@ -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!

28
llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll Normal file
View File

@ -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(...)