diff options
| author | Sanjoy Das <sanjoy@playingwithpointers.com> | 2015-12-08 23:16:52 +0000 |
|---|---|---|
| committer | Sanjoy Das <sanjoy@playingwithpointers.com> | 2015-12-08 23:16:52 +0000 |
| commit | 48945cdc159e47349b28157375960a11809c117d (patch) | |
| tree | c0001b43e838fe1311a762f68c1d883e8c5e0c18 | |
| parent | e6ccd7b66a55363bbc57a7efcff1c514081a6269 (diff) | |
| download | bcm5719-llvm-48945cdc159e47349b28157375960a11809c117d.tar.gz bcm5719-llvm-48945cdc159e47349b28157375960a11809c117d.zip | |
[OperandBundles] Have PruneEH work correct with operand bundles.
For an invoke with operand bundles, the [op_begin(), op_end()-3] range
can contain things other than invoke arguments. This change teaches
PruneEH to use arg_begin() and arg_end() explicitly.
llvm-svn: 255073
| -rw-r--r-- | llvm/lib/Transforms/IPO/PruneEH.cpp | 9 | ||||
| -rw-r--r-- | llvm/test/Transforms/PruneEH/operand-bundles.ll | 26 |
2 files changed, 33 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/IPO/PruneEH.cpp b/llvm/lib/Transforms/IPO/PruneEH.cpp index 714e1d6e42d..c9c0b197eae 100644 --- a/llvm/lib/Transforms/IPO/PruneEH.cpp +++ b/llvm/lib/Transforms/IPO/PruneEH.cpp @@ -191,9 +191,14 @@ bool PruneEH::SimplifyFunction(Function *F) { for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) { if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator())) if (II->doesNotThrow() && canSimplifyInvokeNoUnwind(F)) { - SmallVector<Value*, 8> Args(II->op_begin(), II->op_end() - 3); + CallSite CS(II); + SmallVector<Value*, 8> Args(CS.arg_begin(), CS.arg_end()); + SmallVector<OperandBundleDef, 1> OpBundles; + II->getOperandBundlesAsDefs(OpBundles); + // Insert a call instruction before the invoke. - CallInst *Call = CallInst::Create(II->getCalledValue(), Args, "", II); + CallInst *Call = CallInst::Create(II->getCalledValue(), Args, OpBundles, + "", II); Call->takeName(II); Call->setCallingConv(II->getCallingConv()); Call->setAttributes(II->getAttributes()); diff --git a/llvm/test/Transforms/PruneEH/operand-bundles.ll b/llvm/test/Transforms/PruneEH/operand-bundles.ll new file mode 100644 index 00000000000..efe8f62a8fb --- /dev/null +++ b/llvm/test/Transforms/PruneEH/operand-bundles.ll @@ -0,0 +1,26 @@ +; RUN: opt < %s -prune-eh -S | FileCheck %s + +declare void @nounwind() nounwind + +define internal void @foo() { + call void @nounwind() + ret void +} + +define i32 @caller() personality i32 (...)* @__gxx_personality_v0 { +; CHECK-LABEL: @caller( +; CHECK-NOT: invoke +; CHECK: call void @foo() [ "foo"(i32 0, i8 1) ] + invoke void @foo() [ "foo"(i32 0, i8 1) ] + to label %Normal unwind label %Except + +Normal: ; preds = %0 + ret i32 0 + +Except: ; preds = %0 + landingpad { i8*, i32 } + catch i8* null + ret i32 1 +} + +declare i32 @__gxx_personality_v0(...) |
