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
diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp
index 3ea1620..1c3d5a8 100644
--- a/lib/Transforms/IPO/Inliner.cpp
+++ b/lib/Transforms/IPO/Inliner.cpp
@@ -140,12 +140,7 @@
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 5c97fd2..2eaec06 100644
--- a/lib/Transforms/Utils/InlineCost.cpp
+++ b/lib/Transforms/Utils/InlineCost.cpp
@@ -221,6 +221,9 @@
// 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