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

Support a funclet operand bundle in LowerInvoke 

Summary:
The current LowerInvoke pass cannot handle invoke instructions with a
funclet bundle operand. The order of operands for an invoke instruction
is {call arguments, callee, funclet operand (if any), normal dest,
unwind dest}. The current code assumes there is no funclet operand and
incorrectly includes a funclet operand into call arguments.

Reviewers: rnk

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D46242

llvm-svn: 331832
This commit is contained in:
Heejin Ahn 2018-05-09 00:53:50 +00:00
parent fb663789d3
commit bf7716952a
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Transforms/Utils/LowerInvoke.cpp
View File

@ -48,10 +48,12 @@ static bool runImpl(Function &F) {
bool Changed = false;
for (BasicBlock &BB : F)
if (InvokeInst *II = dyn_cast<InvokeInst>(BB.getTerminator())) {
SmallVector<Value *, 16> CallArgs(II->op_begin(), II->op_end() - 3);
SmallVector<Value *, 16> CallArgs(II->arg_begin(), II->arg_end());
SmallVector<OperandBundleDef, 1> OpBundles;
II->getOperandBundlesAsDefs(OpBundles);
// Insert a normal call instruction...
CallInst *NewCall =
CallInst::Create(II->getCalledValue(), CallArgs, "", II);
CallInst::Create(II->getCalledValue(), CallArgs, OpBundles, "", II);
NewCall->takeName(II);
NewCall->setCallingConv(II->getCallingConv());
NewCall->setAttributes(II->getAttributes());

39
llvm/test/Transforms/Util/lowerinvoke-funclet.ll Normal file
View File

@ -0,0 +1,39 @@
; RUN: opt -lowerinvoke -S < %s | FileCheck %s
; Test if invoke instructions that have a funclet operand bundle can be lowered.
%struct.Cleanup = type { i8 }
define void @lowerinvoke_funclet() personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*) {
; CHECK-LABEL: @lowerinvoke_funclet
entry:
%c = alloca %struct.Cleanup, align 1
invoke void @foo()
to label %try.cont unwind label %catch.dispatch
catch.dispatch: ; preds = %entry
%0 = catchswitch within none [label %catch] unwind to caller
catch: ; preds = %catch.dispatch
%1 = catchpad within %0 [i8* null, i32 64, i8* null]
invoke void @bar(i32 3) [ "funclet"(token %1), "test"(i32 0) ]
to label %invoke.cont1 unwind label %ehcleanup
; CHECK: call void @bar(i32 3) [ "funclet"(token %1), "test"(i32 0) ]
invoke.cont1: ; preds = %catch
call void @"??1Cleanup@@QEAA@XZ"(%struct.Cleanup* %c) #3 [ "funclet"(token %1) ]
catchret from %1 to label %try.cont
try.cont: ; preds = %entry, %invoke.cont1
ret void
ehcleanup: ; preds = %catch
%2 = cleanuppad within %1 []
call void @"??1Cleanup@@QEAA@XZ"(%struct.Cleanup* %c) #3 [ "funclet"(token %2) ]
cleanupret from %2 unwind to caller
}
declare void @foo()
declare void @bar(i32)
declare i32 @__CxxFrameHandler3(...)
declare void @"??1Cleanup@@QEAA@XZ"(%struct.Cleanup*) unnamed_addr