mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
add some accessors to callsite/callinst/invokeinst to check
for the noinline attribute, and make the inliner refuse to inline a call site when the call site is marked noinline even if the callee isn't. This fixes PR6682. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99341 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
bc7a902713
commit
a54934ae9d
@ -971,6 +971,13 @@ public:
|
||||
unsigned getParamAlignment(unsigned i) const {
|
||||
return AttributeList.getParamAlignment(i);
|
||||
}
|
||||
|
||||
/// @brief Return true if the call should not be inlined.
|
||||
bool isNoInline() const { return paramHasAttr(~0, Attribute::NoInline); }
|
||||
void setIsNoInline(bool Value) {
|
||||
if (Value) addAttribute(~0, Attribute::NoInline);
|
||||
else removeAttribute(~0, Attribute::NoInline);
|
||||
}
|
||||
|
||||
/// @brief Determine if the call does not access memory.
|
||||
bool doesNotAccessMemory() const {
|
||||
@ -2456,6 +2463,13 @@ public:
|
||||
return AttributeList.getParamAlignment(i);
|
||||
}
|
||||
|
||||
/// @brief Return true if the call should not be inlined.
|
||||
bool isNoInline() const { return paramHasAttr(~0, Attribute::NoInline); }
|
||||
void setIsNoInline(bool Value) {
|
||||
if (Value) addAttribute(~0, Attribute::NoInline);
|
||||
else removeAttribute(~0, Attribute::NoInline);
|
||||
}
|
||||
|
||||
/// @brief Determine if the call does not access memory.
|
||||
bool doesNotAccessMemory() const {
|
||||
return paramHasAttr(~0, Attribute::ReadNone);
|
||||
|
@ -76,6 +76,10 @@ public:
|
||||
/// @brief Extract the alignment for a call or parameter (0=unknown).
|
||||
uint16_t getParamAlignment(uint16_t i) const;
|
||||
|
||||
/// @brief Return true if the call should not be inlined.
|
||||
bool isNoInline() const;
|
||||
void setIsNoInline(bool Value = true);
|
||||
|
||||
/// @brief Determine if the call does not access memory.
|
||||
bool doesNotAccessMemory() const;
|
||||
void setDoesNotAccessMemory(bool doesNotAccessMemory = true);
|
||||
|
@ -229,7 +229,9 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD,
|
||||
const Function *CalledFunc = CS.getCalledFunction();
|
||||
if (CalledFunc == 0 || // Can't inline external function or indirect
|
||||
CalledFunc->isDeclaration() || // call, or call to a vararg function!
|
||||
CalledFunc->getFunctionType()->isVarArg()) return false;
|
||||
CalledFunc->getFunctionType()->isVarArg() ||
|
||||
CS.isNoInline()) // Call site is marked noinline.
|
||||
return false;
|
||||
|
||||
|
||||
// If the call to the callee is not a tail call, we must clear the 'tail'
|
||||
|
@ -31,13 +31,13 @@ using namespace llvm;
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#define CALLSITE_DELEGATE_GETTER(METHOD) \
|
||||
Instruction *II(getInstruction()); \
|
||||
Instruction *II = getInstruction(); \
|
||||
return isCall() \
|
||||
? cast<CallInst>(II)->METHOD \
|
||||
: cast<InvokeInst>(II)->METHOD
|
||||
|
||||
#define CALLSITE_DELEGATE_SETTER(METHOD) \
|
||||
Instruction *II(getInstruction()); \
|
||||
Instruction *II = getInstruction(); \
|
||||
if (isCall()) \
|
||||
cast<CallInst>(II)->METHOD; \
|
||||
else \
|
||||
@ -66,6 +66,17 @@ bool CallSite::paramHasAttr(uint16_t i, Attributes attr) const {
|
||||
uint16_t CallSite::getParamAlignment(uint16_t i) const {
|
||||
CALLSITE_DELEGATE_GETTER(getParamAlignment(i));
|
||||
}
|
||||
|
||||
/// @brief Return true if the call should not be inlined.
|
||||
bool CallSite::isNoInline() const {
|
||||
CALLSITE_DELEGATE_GETTER(isNoInline());
|
||||
}
|
||||
|
||||
void CallSite::setIsNoInline(bool Value) {
|
||||
CALLSITE_DELEGATE_GETTER(setIsNoInline(Value));
|
||||
}
|
||||
|
||||
|
||||
bool CallSite::doesNotAccessMemory() const {
|
||||
CALLSITE_DELEGATE_GETTER(doesNotAccessMemory());
|
||||
}
|
||||
|
18
test/Transforms/Inline/noinline.ll
Normal file
18
test/Transforms/Inline/noinline.ll
Normal file
@ -0,0 +1,18 @@
|
||||
; RUN: opt %s -inline -S | FileCheck %s
|
||||
; PR6682
|
||||
declare void @foo() nounwind
|
||||
|
||||
define void @bar() nounwind {
|
||||
entry:
|
||||
tail call void @foo() nounwind
|
||||
ret void
|
||||
}
|
||||
|
||||
define void @bazz() nounwind {
|
||||
entry:
|
||||
tail call void @bar() nounwind noinline
|
||||
ret void
|
||||
}
|
||||
|
||||
; CHECK: define void @bazz()
|
||||
; CHECK: call void @bar()
|
Loading…
Reference in New Issue
Block a user