[PATCH] D15345: [OperandBundles] Fix a transform in simplifycfg

[Sanjoy Das via llvm-commits]

sanjoy created this revision.
sanjoy added a reviewer: pcc.
sanjoy added a subscriber: llvm-commits.

http://reviews.llvm.org/D15345

Files:
  lib/Transforms/Utils/Local.cpp
  test/Transforms/SimplifyCFG/invoke_unwind.ll

Index: test/Transforms/SimplifyCFG/invoke_unwind.ll
===================================================================
--- test/Transforms/SimplifyCFG/invoke_unwind.ll
+++ test/Transforms/SimplifyCFG/invoke_unwind.ll
@@ -17,4 +17,17 @@
         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(...)
Index: lib/Transforms/Utils/Local.cpp
===================================================================
--- lib/Transforms/Utils/Local.cpp
+++ lib/Transforms/Utils/Local.cpp
@@ -1210,8 +1210,12 @@
 
 /// 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());


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D15345.42208.patch
Type: text/x-patch
Size: 1611 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151208/cf2320e5/attachment.bin>