mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-04-14 06:37:33 +00:00
Transforms: Canonicalize access to function attributes, NFC
Canonicalize access to function attributes to use the simpler API. getAttributes().getAttribute(AttributeSet::FunctionIndex, Kind) => getFnAttribute(Kind) getAttributes().hasAttribute(AttributeSet::FunctionIndex, Kind) => hasFnAttribute(Kind) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229202 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ef126cdf56
commit
7520a90c75
@ -97,25 +97,17 @@ static void AdjustCallerSSPLevel(Function *Caller, Function *Callee) {
|
||||
AttributeSet OldSSPAttr = AttributeSet::get(Caller->getContext(),
|
||||
AttributeSet::FunctionIndex,
|
||||
B);
|
||||
AttributeSet CallerAttr = Caller->getAttributes(),
|
||||
CalleeAttr = Callee->getAttributes();
|
||||
|
||||
if (CalleeAttr.hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::StackProtectReq)) {
|
||||
if (Callee->hasFnAttribute(Attribute::StackProtectReq)) {
|
||||
Caller->removeAttributes(AttributeSet::FunctionIndex, OldSSPAttr);
|
||||
Caller->addFnAttr(Attribute::StackProtectReq);
|
||||
} else if (CalleeAttr.hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::StackProtectStrong) &&
|
||||
!CallerAttr.hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::StackProtectReq)) {
|
||||
} else if (Callee->hasFnAttribute(Attribute::StackProtectStrong) &&
|
||||
!Caller->hasFnAttribute(Attribute::StackProtectReq)) {
|
||||
Caller->removeAttributes(AttributeSet::FunctionIndex, OldSSPAttr);
|
||||
Caller->addFnAttr(Attribute::StackProtectStrong);
|
||||
} else if (CalleeAttr.hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::StackProtect) &&
|
||||
!CallerAttr.hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::StackProtectReq) &&
|
||||
!CallerAttr.hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::StackProtectStrong))
|
||||
} else if (Callee->hasFnAttribute(Attribute::StackProtect) &&
|
||||
!Caller->hasFnAttribute(Attribute::StackProtectReq) &&
|
||||
!Caller->hasFnAttribute(Attribute::StackProtectStrong))
|
||||
Caller->addFnAttr(Attribute::StackProtect);
|
||||
}
|
||||
|
||||
@ -273,8 +265,7 @@ unsigned Inliner::getInlineThreshold(CallSite CS) const {
|
||||
// would decrease the threshold.
|
||||
Function *Caller = CS.getCaller();
|
||||
bool OptSize = Caller && !Caller->isDeclaration() &&
|
||||
Caller->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::OptimizeForSize);
|
||||
Caller->hasFnAttribute(Attribute::OptimizeForSize);
|
||||
if (!(InlineLimit.getNumOccurrences() > 0) && OptSize &&
|
||||
OptSizeThreshold < thres)
|
||||
thres = OptSizeThreshold;
|
||||
@ -283,17 +274,14 @@ unsigned Inliner::getInlineThreshold(CallSite CS) const {
|
||||
// and the caller does not need to minimize its size.
|
||||
Function *Callee = CS.getCalledFunction();
|
||||
bool InlineHint = Callee && !Callee->isDeclaration() &&
|
||||
Callee->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::InlineHint);
|
||||
if (InlineHint && HintThreshold > thres
|
||||
&& !Caller->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::MinSize))
|
||||
Callee->hasFnAttribute(Attribute::InlineHint);
|
||||
if (InlineHint && HintThreshold > thres &&
|
||||
!Caller->hasFnAttribute(Attribute::MinSize))
|
||||
thres = HintThreshold;
|
||||
|
||||
// Listen to the cold attribute when it would decrease the threshold.
|
||||
bool ColdCallee = Callee && !Callee->isDeclaration() &&
|
||||
Callee->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::Cold);
|
||||
Callee->hasFnAttribute(Attribute::Cold);
|
||||
// Command line argument for InlineLimit will override the default
|
||||
// ColdThreshold. If we have -inline-threshold but no -inlinecold-threshold,
|
||||
// do not use the default cold threshold even if it is smaller.
|
||||
@ -659,9 +647,7 @@ bool Inliner::removeDeadFunctions(CallGraph &CG, bool AlwaysInlineOnly) {
|
||||
// Handle the case when this function is called and we only want to care
|
||||
// about always-inline functions. This is a bit of a hack to share code
|
||||
// between here and the InlineAlways pass.
|
||||
if (AlwaysInlineOnly &&
|
||||
!F->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::AlwaysInline))
|
||||
if (AlwaysInlineOnly && !F->hasFnAttribute(Attribute::AlwaysInline))
|
||||
continue;
|
||||
|
||||
// If the only remaining users of the function are dead constants, remove
|
||||
|
@ -2915,8 +2915,7 @@ static bool combineInstructionsOverFunction(
|
||||
TargetLibraryInfo &TLI, DominatorTree &DT, const DataLayout *DL = nullptr,
|
||||
LoopInfo *LI = nullptr) {
|
||||
// Minimizing size?
|
||||
bool MinimizeSize = F.getAttributes().hasAttribute(
|
||||
AttributeSet::FunctionIndex, Attribute::MinSize);
|
||||
bool MinimizeSize = F.hasFnAttribute(Attribute::MinSize);
|
||||
|
||||
/// Builder - This is an IRBuilder that automatically inserts new
|
||||
/// instructions into the worklist when they are created.
|
||||
|
@ -583,8 +583,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
|
||||
MemorySanitizerVisitor(Function &F, MemorySanitizer &MS)
|
||||
: F(F), MS(MS), VAHelper(CreateVarArgHelper(F, MS, *this)) {
|
||||
bool SanitizeFunction = F.getAttributes().hasAttribute(
|
||||
AttributeSet::FunctionIndex, Attribute::SanitizeMemory);
|
||||
bool SanitizeFunction = F.hasFnAttribute(Attribute::SanitizeMemory);
|
||||
InsertChecks = SanitizeFunction;
|
||||
PropagateShadow = SanitizeFunction;
|
||||
PoisonStack = SanitizeFunction && ClPoisonStack;
|
||||
|
@ -213,9 +213,8 @@ namespace {
|
||||
|
||||
PartialThreshold = UserThreshold ? CurrentThreshold : UP.PartialThreshold;
|
||||
if (!UserThreshold &&
|
||||
L->getHeader()->getParent()->getAttributes().
|
||||
hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::OptimizeForSize)) {
|
||||
L->getHeader()->getParent()->hasFnAttribute(
|
||||
Attribute::OptimizeForSize)) {
|
||||
Threshold = UP.OptSizeThreshold;
|
||||
PartialThreshold = UP.PartialOptSizeThreshold;
|
||||
}
|
||||
|
@ -657,9 +657,7 @@ bool LoopUnswitch::UnswitchIfProfitable(Value *LoopCond, Constant *Val) {
|
||||
// Check to see if it would be profitable to unswitch current loop.
|
||||
|
||||
// Do not do non-trivial unswitch while optimizing for size.
|
||||
if (OptimizeForSize ||
|
||||
F->getAttributes().hasAttribute(AttributeSet::FunctionIndex,
|
||||
Attribute::OptimizeForSize))
|
||||
if (OptimizeForSize || F->hasFnAttribute(Attribute::OptimizeForSize))
|
||||
return false;
|
||||
|
||||
UnswitchNontrivialCondition(LoopCond, Val, currentLoop);
|
||||
|
@ -3454,9 +3454,8 @@ bool LoopVectorizationLegality::canVectorizeInstrs() {
|
||||
// Look for the attribute signaling the absence of NaNs.
|
||||
Function &F = *Header->getParent();
|
||||
if (F.hasFnAttribute("no-nans-fp-math"))
|
||||
HasFunNoNaNAttr = F.getAttributes().getAttribute(
|
||||
AttributeSet::FunctionIndex,
|
||||
"no-nans-fp-math").getValueAsString() == "true";
|
||||
HasFunNoNaNAttr =
|
||||
F.getFnAttribute("no-nans-fp-math").getValueAsString() == "true";
|
||||
|
||||
// For each block in the loop.
|
||||
for (Loop::block_iterator bb = TheLoop->block_begin(),
|
||||
|
Loading…
x
Reference in New Issue
Block a user