From d77922f1a2ed9290544ded8a50d52fd24065556f Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 9 Nov 2003 05:05:36 +0000 Subject: [PATCH] Do NOT inline self recursive calls into other functions. This is causing the pool allocator no end of trouble, and doesn't make a lot of sense anyway. This does not solve the problem with mutually recursive functions, but they are much less common. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9828 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/Inliner.cpp | 5 ++++- lib/Transforms/IPO/Inliner.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 6c7a1914a95..8ad72ab9a17 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -64,10 +64,13 @@ bool Inliner::runOnSCC(const std::vector &SCC) { if (isa(I) || isa(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 2f770bfd55d..1f3d0d2dc22 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 IsRecursiveFunction; + bool performInlining(CallSite CS, std::set &SCC); };