RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-26 14:25:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[InstCombine] Don't drop operand bundles

Browse Source 
Reviewers: majnemer

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D14857

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254046 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sanjoy Das 2015-11-25 00:42:19 +00:00
parent 5c7d512e13
commit 8a44ac7412
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/IR/IRBuilder.h
View File

@ -691,6 +691,13 @@ public:
return Insert(InvokeInst::Create(Callee, NormalDest, UnwindDest, Args),
Name);
}
InvokeInst *CreateInvoke(Value *Callee, BasicBlock *NormalDest,
BasicBlock *UnwindDest, ArrayRef<Value *> Args,
ArrayRef<OperandBundleDef> OpBundles,
const Twine &Name = "") {
return Insert(InvokeInst::Create(Callee, NormalDest, UnwindDest, Args,
OpBundles), Name);
}
ResumeInst *CreateResume(Value *Exn) {
return Insert(ResumeInst::Create(Exn));
@ -1528,7 +1535,12 @@ public:
}
CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args = None,
ArrayRef<OperandBundleDef> OpBundles = None,
const Twine &Name = "") {
return Insert(CallInst::Create(Callee, Args, OpBundles), Name);
}
CallInst *CreateCall(Value *Callee, ArrayRef<Value *> Args,
const Twine &Name) {
return Insert(CallInst::Create(Callee, Args), Name);
}

13
lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -2267,16 +2267,23 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) {
const AttributeSet &NewCallerPAL = AttributeSet::get(Callee->getContext(),
attrVec);
SmallVector<OperandBundleDef, 1> OpBundles;
// Convert the operand bundle uses to operand bundle defs. See InstrTypes.h
// for details on how these differ.
for (unsigned i = 0, e = CS.getNumOperandBundles(); i != e; ++i)
OpBundles.emplace_back(CS.getOperandBundleAt(i));
Instruction *NC;
if (InvokeInst *II = dyn_cast<InvokeInst>(Caller)) {
NC = Builder->CreateInvoke(Callee, II->getNormalDest(),
II->getUnwindDest(), Args);
NC = Builder->CreateInvoke(Callee, II->getNormalDest(), II->getUnwindDest(),
Args, OpBundles);
NC->takeName(II);
cast<InvokeInst>(NC)->setCallingConv(II->getCallingConv());
cast<InvokeInst>(NC)->setAttributes(NewCallerPAL);
} else {
CallInst *CI = cast<CallInst>(Caller);
NC = Builder->CreateCall(Callee, Args);
NC = Builder->CreateCall(Callee, Args, OpBundles);
NC->takeName(CI);
if (CI->isTailCall())
cast<CallInst>(NC)->setTailCall();

11
test/Transforms/InstCombine/cast-callee-deopt-bundles.ll Normal file
View File

@ -0,0 +1,11 @@
; RUN: opt -instcombine -S < %s | FileCheck %s
declare void @foo(i32)
define void @g() {
; CHECK-LABEL: @g(
entry:
; CHECK: call void @foo(i32 0) [ "deopt"() ]
call void bitcast (void (i32)* @foo to void ()*) () [ "deopt"() ]
ret void
}