Changes in directory llvm/lib/Transforms/IPO:
Inliner.cpp updated: 1.31 -> 1.32 --- Log message: second patch to fix PR992: http://llvm.org/PR992 /993. --- Diffs of the changes: (+17 -4) Inliner.cpp | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) Index: llvm/lib/Transforms/IPO/Inliner.cpp diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.31 llvm/lib/Transforms/IPO/Inliner.cpp:1.32 --- llvm/lib/Transforms/IPO/Inliner.cpp:1.31 Thu Nov 9 17:17:45 2006 +++ llvm/lib/Transforms/IPO/Inliner.cpp Thu Nov 9 17:36:08 2006 @@ -112,8 +112,13 @@ // Calls to external functions are never inlinable. if (Callee->isExternal() || CallSites[CSi].getInstruction()->getParent()->getParent() ==Callee){ - std::swap(CallSites[CSi], CallSites.back()); - CallSites.pop_back(); + if (SCC.size() == 1) { + std::swap(CallSites[CSi], CallSites.back()); + CallSites.pop_back(); + } else { + // Keep the 'in SCC / not in SCC' boundary correct. + CallSites.erase(CallSites.begin()+CSi); + } --CSi; continue; } @@ -131,8 +136,16 @@ // Attempt to inline the function... if (InlineCallIfPossible(CS, CG, SCCFunctions)) { - // Remove this call site from the list. - CallSites.erase(CallSites.begin()+CSi); + // Remove this call site from the list. If possible, use + // swap/pop_back for efficiency, but do not use it if doing so would + // move a call site to a function in this SCC before the + // 'FirstCallInSCC' barrier. + if (SCC.size() == 1) { + std::swap(CallSites[CSi], CallSites.back()); + CallSites.pop_back(); + } else { + CallSites.erase(CallSites.begin()+CSi); + } --CSi; ++NumInlined; _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
