From 67243399dd7427c4f530a8c8cc73dfcfd4788f73 Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Wed, 3 Sep 2008 18:47:45 +0000 Subject: [PATCH] Handle "always inline" note during inline cost analysis. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55712 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/Inliner.cpp | 7 +------ lib/Transforms/Utils/InlineCost.cpp | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 3ea16208a52..1c3d5a81f36 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -140,12 +140,7 @@ bool Inliner::runOnSCC(const std::vector &SCC) { int InlineCost = getInlineCost(CS); float FudgeFactor = getInlineFudgeFactor(CS); - Function *Fn = CS.getCalledFunction(); - bool AlwaysInline = false; - if (Fn && (Fn->getNotes() & FN_NOTE_AlwaysInline)) - AlwaysInline = true; - if (!AlwaysInline - && InlineCost >= (int)(InlineThreshold * FudgeFactor)) { + if (InlineCost >= (int)(InlineThreshold * FudgeFactor)) { DOUT << " NOT Inlining: cost=" << InlineCost << ", Call: " << *CS.getInstruction(); } else { diff --git a/lib/Transforms/Utils/InlineCost.cpp b/lib/Transforms/Utils/InlineCost.cpp index 5c97fd2f706..2eaec06b353 100644 --- a/lib/Transforms/Utils/InlineCost.cpp +++ b/lib/Transforms/Utils/InlineCost.cpp @@ -221,6 +221,9 @@ int InlineCostAnalyzer::getInlineCost(CallSite CS, // If we should never inline this, return a huge cost. if (CalleeFI.NeverInline) return 2000000000; + + if (Callee->getNotes() & FN_NOTE_AlwaysInline) + return -2000000000; // Add to the inline quality for properties that make the call valuable to // inline. This includes factors that indicate that the result of inlining