replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the regression I introduced in r159385 (it's necessary to update PHI nodes in unwind BB 

llvm-svn: 159534
This commit is contained in:
Nuno Lopes 2012-07-02 16:14:47 +00:00
parent 6f510f8eb5
commit d0bcfe4d9d
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
View File

@ -99,6 +99,9 @@ static void ChangeToCall(InvokeInst *II) {
// Follow the call by a branch to the normal destination.
BranchInst::Create(II->getNormalDest(), II);
// Update PHI nodes in the unwind destination
II->getUnwindDest()->removePredecessor(II->getParent());
II->eraseFromParent();
}

33
llvm/test/Transforms/SimplifyCFG/invoke.ll
View File

@ -4,6 +4,8 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
declare i32 @__gxx_personality_v0(...)
declare void @__cxa_call_unexpected(i8*)
declare i32 @read_only() nounwind readonly
declare i32 @nounwind_fn() nounwind
declare i32 @fn()
; CHECK: @f1
@ -82,3 +84,34 @@ lpad:
tail call void @__cxa_call_unexpected(i8* %1) noreturn nounwind
unreachable
}
; CHECK: @f5
define i32 @f5(i1 %cond, i8* %a, i8* %b) {
entry:
br i1 %cond, label %x, label %y
x:
; CHECK: invoke i32 @fn()
%call = invoke i32 @fn()
to label %cont unwind label %lpad
y:
; CHECK: call i32 @nounwind_fn()
%call2 = invoke i32 @nounwind_fn()
to label %cont unwind label %lpad
cont:
; CHECK: phi i32
; CHECK: ret i32 %phi
%phi = phi i32 [%call, %x], [%call2, %y]
ret i32 %phi
lpad:
; CHECK-NOT: phi
%phi2 = phi i8* [%a, %x], [%b, %y]
%0 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
filter [0 x i8*] zeroinitializer
; CHECK: __cxa_call_unexpected(i8* %a)
tail call void @__cxa_call_unexpected(i8* %phi2) noreturn nounwind
unreachable
}