6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Temporarily revert this, it's causing an issue with an internal project.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99451 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2010-03-24 23:35:21 +00:00
parent 014dc4e720
commit 0623e90398
5 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/llvm/Instructions.h
View File

@ -971,13 +971,6 @@ public:
unsigned getParamAlignment(unsigned i) const { unsigned getParamAlignment(unsigned i) const {
return AttributeList.getParamAlignment(i); 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. /// @brief Determine if the call does not access memory.
bool doesNotAccessMemory() const { bool doesNotAccessMemory() const {
@ -2463,13 +2456,6 @@ public:
return AttributeList.getParamAlignment(i); 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. /// @brief Determine if the call does not access memory.
bool doesNotAccessMemory() const { bool doesNotAccessMemory() const {
return paramHasAttr(~0, Attribute::ReadNone); return paramHasAttr(~0, Attribute::ReadNone);

4
include/llvm/Support/CallSite.h
View File

@ -76,10 +76,6 @@ public:
/// @brief Extract the alignment for a call or parameter (0=unknown). /// @brief Extract the alignment for a call or parameter (0=unknown).
uint16_t getParamAlignment(uint16_t i) const; 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. /// @brief Determine if the call does not access memory.
bool doesNotAccessMemory() const; bool doesNotAccessMemory() const;
void setDoesNotAccessMemory(bool doesNotAccessMemory = true); void setDoesNotAccessMemory(bool doesNotAccessMemory = true);

4
lib/Transforms/Utils/InlineFunction.cpp
View File

@ -229,9 +229,7 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD,
const Function *CalledFunc = CS.getCalledFunction(); const Function *CalledFunc = CS.getCalledFunction();
if (CalledFunc == 0 || // Can't inline external function or indirect if (CalledFunc == 0 || // Can't inline external function or indirect
CalledFunc->isDeclaration() || // call, or call to a vararg function! CalledFunc->isDeclaration() || // call, or call to a vararg function!
CalledFunc->getFunctionType()->isVarArg() || CalledFunc->getFunctionType()->isVarArg()) return false;
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' // If the call to the callee is not a tail call, we must clear the 'tail'

15
lib/VMCore/Instructions.cpp
View File

@ -31,13 +31,13 @@ using namespace llvm;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#define CALLSITE_DELEGATE_GETTER(METHOD) \ #define CALLSITE_DELEGATE_GETTER(METHOD) \
Instruction *II = getInstruction(); \ Instruction *II(getInstruction()); \
return isCall() \ return isCall() \
? cast<CallInst>(II)->METHOD \ ? cast<CallInst>(II)->METHOD \
: cast<InvokeInst>(II)->METHOD : cast<InvokeInst>(II)->METHOD
#define CALLSITE_DELEGATE_SETTER(METHOD) \ #define CALLSITE_DELEGATE_SETTER(METHOD) \
Instruction *II = getInstruction(); \ Instruction *II(getInstruction()); \
if (isCall()) \ if (isCall()) \
cast<CallInst>(II)->METHOD; \ cast<CallInst>(II)->METHOD; \
else \ else \
@ -66,17 +66,6 @@ bool CallSite::paramHasAttr(uint16_t i, Attributes attr) const {
uint16_t CallSite::getParamAlignment(uint16_t i) const { uint16_t CallSite::getParamAlignment(uint16_t i) const {
CALLSITE_DELEGATE_GETTER(getParamAlignment(i)); 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 { bool CallSite::doesNotAccessMemory() const {
CALLSITE_DELEGATE_GETTER(doesNotAccessMemory()); CALLSITE_DELEGATE_GETTER(doesNotAccessMemory());
} }

18
test/Transforms/Inline/noinline.ll
View File

@ -1,18 +0,0 @@
; 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()