diff options
| -rw-r--r-- | lib/Transforms/IPO/Inliner.cpp | 5 | ||||
| -rw-r--r-- | lib/Transforms/IPO/Inliner.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 6c7a1914a9..8ad72ab9a1 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -64,10 +64,13 @@ bool Inliner::runOnSCC(const std::vector<CallGraphNode*> &SCC) { if (isa<CallInst>(I) || isa<InvokeInst>(I)) { CallSite CS = CallSite::get(I); if (Function *Callee = CS.getCalledFunction()) - if (!Callee->isExternal()) { + if (!Callee->isExternal() && !IsRecursiveFunction.count(Callee)) { // Determine whether this is a function IN the SCC... bool inSCC = SCCFunctions.count(Callee); + // Keep track of whether this is a directly recursive function. + if (Callee == F) IsRecursiveFunction.insert(F); + // If the policy determines that we should inline this function, // try to do so... int InlineCost = inSCC ? getRecursiveInlineCost(CS) : diff --git a/lib/Transforms/IPO/Inliner.h b/lib/Transforms/IPO/Inliner.h index 2f770bfd55..1f3d0d2dc2 100644 --- a/lib/Transforms/IPO/Inliner.h +++ b/lib/Transforms/IPO/Inliner.h @@ -51,7 +51,13 @@ struct Inliner : public CallGraphSCCPass { virtual int getRecursiveInlineCost(CallSite CS); private: + // InlineThreshold - Cache the value here for easy access. unsigned InlineThreshold; + + // IsRecursiveFunction - This contains all functions which are directly + // recursive, which we do NOT want to inline into other functions. + std::set<Function*> IsRecursiveFunction; + bool performInlining(CallSite CS, std::set<Function*> &SCC); }; |