From 12ab14b2f8ca5385ce1ac43603192b507f0ebe21 Mon Sep 17 00:00:00 2001 From: Sanjoy Das Date: Tue, 8 Dec 2015 22:26:08 +0000 Subject: [PATCH] [OperandBundles] Fix a transform in simplifycfg Reviewers: pcc, majnemer, reames Subscribers: reames, llvm-commits Differential Revision: http://reviews.llvm.org/D15345 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255062 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/Local.cpp | 8 ++++++-- test/Transforms/SimplifyCFG/invoke_unwind.ll | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index ba79b32ac3d..19122dd21a7 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/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 Args(II->op_begin(), II->op_end() - 3); - CallInst *NewCall = CallInst::Create(II->getCalledValue(), Args, "", II); + CallSite CS(II); + SmallVector Args(CS.arg_begin(), CS.arg_end()); + SmallVector 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/test/Transforms/SimplifyCFG/invoke_unwind.ll b/test/Transforms/SimplifyCFG/invoke_unwind.ll index 3b4c09d96f7..100bfd4e9e3 100644 --- a/test/Transforms/SimplifyCFG/invoke_unwind.ll +++ b/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(...) -- 2.34.1