diff options
| -rw-r--r-- | llvm/lib/Transforms/Utils/Local.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/Transforms/SimplifyCFG/invoke_unwind.ll | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp index ba79b32ac3d..19122dd21a7 100644 --- a/llvm/lib/Transforms/Utils/Local.cpp +++ b/llvm/lib/Transforms/Utils/Local.cpp @@ -1210,8 +1210,12 @@ static void changeToUnreachable(Instruction *I, bool UseLLVMTrap) { /// changeToCall - Convert the specified invoke into a normal call. static void changeToCall(InvokeInst *II) { - SmallVector<Value*, 8> Args(II->op_begin(), II->op_end() - 3); - CallInst *NewCall = CallInst::Create(II->getCalledValue(), Args, "", II); + CallSite CS(II); + SmallVector<Value*, 8> Args(CS.arg_begin(), CS.arg_end()); + SmallVector<OperandBundleDef, 1> OpBundles; + II->getOperandBundlesAsDefs(OpBundles); + CallInst *NewCall = CallInst::Create(II->getCalledValue(), Args, OpBundles, + "", II); NewCall->takeName(II); NewCall->setCallingConv(II->getCallingConv()); NewCall->setAttributes(II->getAttributes()); diff --git a/llvm/test/Transforms/SimplifyCFG/invoke_unwind.ll b/llvm/test/Transforms/SimplifyCFG/invoke_unwind.ll index 3b4c09d96f7..100bfd4e9e3 100644 --- a/llvm/test/Transforms/SimplifyCFG/invoke_unwind.ll +++ b/llvm/test/Transforms/SimplifyCFG/invoke_unwind.ll @@ -17,4 +17,17 @@ Rethrow: resume { i8*, i32 } %exn } +define i32 @test2() personality i32 (...)* @__gxx_personality_v0 { +; CHECK-LABEL: @test2( +; CHECK-NEXT: call void @bar() [ "foo"(i32 100) ] +; CHECK-NEXT: ret i32 0 + invoke void @bar( ) [ "foo"(i32 100) ] + to label %1 unwind label %Rethrow + ret i32 0 +Rethrow: + %exn = landingpad {i8*, i32} + catch i8* null + resume { i8*, i32 } %exn +} + declare i32 @__gxx_personality_v0(...) |
