diff options
| author | Chris Lattner <sabre@nondot.org> | 2008-07-14 00:46:56 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2008-07-14 00:46:56 +0000 |
| commit | 2831ad28be0f3c70b757bf60e29d52ca985abf54 (patch) | |
| tree | 2ad4b463dbe6b28f5b48804f2ae24546939b8386 /llvm/lib | |
| parent | 6f5ea6e49c6e0e44495256fa25d5871cac42107c (diff) | |
| download | bcm5719-llvm-2831ad28be0f3c70b757bf60e29d52ca985abf54.tar.gz bcm5719-llvm-2831ad28be0f3c70b757bf60e29d52ca985abf54.zip | |
If a function calls setjmp, never inline it into other functions. This is
a hack around the fact that we don't represent the CFG correctly for sj/lj.
It fixes PR2486.
llvm-svn: 53540
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Transforms/Utils/InlineCost.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineCost.cpp b/llvm/lib/Transforms/Utils/InlineCost.cpp index c17705bf850..10cb77bbcba 100644 --- a/llvm/lib/Transforms/Utils/InlineCost.cpp +++ b/llvm/lib/Transforms/Utils/InlineCost.cpp @@ -100,9 +100,27 @@ void InlineCostAnalyzer::FunctionInfo::analyzeFunction(Function *F) { for (Function::const_iterator BB = F->begin(), E = F->end(); BB != E; ++BB) { for (BasicBlock::const_iterator II = BB->begin(), E = BB->end(); II != E; ++II) { - if (isa<DbgInfoIntrinsic>(II)) continue; // Debug intrinsics don't count. if (isa<PHINode>(II)) continue; // PHI nodes don't count. + // Special handling for calls. + if (isa<CallInst>(II) || isa<InvokeInst>(II)) { + if (isa<DbgInfoIntrinsic>(II)) + continue; // Debug intrinsics don't count as size. + + CallSite CS = CallSite::get(const_cast<Instruction*>(&*II)); + + // If this function contains a call to setjmp or _setjmp, never inline + // it. This is a hack because we depend on the user marking their local + // variables as volatile if they are live across a setjmp call, and they + // probably won't do this in callers. + if (Function *F = CS.getCalledFunction()) + if (F->isDeclaration() && + (F->isName("setjmp") || F->isName("_setjmp"))) { + NeverInline = true; + return; + } + } + if (isa<ExtractElementInst>(II) || isa<VectorType>(II->getType())) ++NumVectorInsts; @@ -194,6 +212,10 @@ int InlineCostAnalyzer::getInlineCost(CallSite CS, // If we haven't calculated this information yet, do so now. if (CalleeFI.NumBlocks == 0) CalleeFI.analyzeFunction(Callee); + + // If we should never inline this, return a huge cost. + if (CalleeFI.NeverInline) + 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 |

