diff options
| -rw-r--r-- | lib/Transforms/IPO/InlineSimple.cpp | 5 | ||||
| -rw-r--r-- | lib/Transforms/IPO/Inliner.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/Transforms/IPO/InlineSimple.cpp b/lib/Transforms/IPO/InlineSimple.cpp index 63a4798cce..4171e22302 100644 --- a/lib/Transforms/IPO/InlineSimple.cpp +++ b/lib/Transforms/IPO/InlineSimple.cpp @@ -63,6 +63,11 @@ bool SimpleInliner::doInitialization(CallGraph &CG) { Module &M = CG.getModule(); + for (Module::iterator I = M.begin(), E = M.end(); + I != E; ++I) + if (!I->isDeclaration() && I->getNotes() == FN_NOTE_NoInline) + NeverInline.insert(I); + // Get llvm.noinline GlobalVariable *GV = M.getNamedGlobal("llvm.noinline"); diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 845ffd864e..3ea16208a5 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -144,10 +144,8 @@ bool Inliner::runOnSCC(const std::vector<CallGraphNode*> &SCC) { bool AlwaysInline = false; if (Fn && (Fn->getNotes() & FN_NOTE_AlwaysInline)) AlwaysInline = true; - if (Fn && (Fn->getNotes() & FN_NOTE_NoInline)) - DOUT << "NOT Inlining: inline=never is set" << *CS.getInstruction(); - else if (!AlwaysInline - && InlineCost >= (int)(InlineThreshold * FudgeFactor)) { + if (!AlwaysInline + && InlineCost >= (int)(InlineThreshold * FudgeFactor)) { DOUT << " NOT Inlining: cost=" << InlineCost << ", Call: " << *CS.getInstruction(); } else { |