From cdb16aa5ab6013268d0ee0a8c8c29a8ebafb799b Mon Sep 17 00:00:00 2001 From: Dale Johannesen Date: Wed, 4 Mar 2009 01:53:05 +0000 Subject: Always skip ptr-to-ptr bitcasts when counting, per Chris' suggestion. Slightly faster. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65999 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/InlineFunction.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/Transforms/Utils/InlineFunction.cpp') diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index a96c7ceaa8..9cd38cc55e 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -235,7 +235,7 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { // function. std::vector Returns; ClonedCodeInfo InlinedFunctionInfo; - Function::iterator FirstNewBlock; + Function::iterator FirstNewBlock, LastNewBlock; { // Scope to destroy ValueMap after cloning. DenseMap ValueMap; @@ -312,6 +312,7 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { // Remember the first block that is newly cloned over. FirstNewBlock = LastBlock; ++FirstNewBlock; + LastNewBlock = &Caller->back(); // Update the callgraph if requested. if (CG) @@ -537,7 +538,9 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { // Add a branch to the merge points and remove return instructions. for (unsigned i = 0, e = Returns.size(); i != e; ++i) { ReturnInst *RI = Returns[i]; - BranchInst::Create(AfterCallBB, RI); + // A return in the last block in the function falls through. +// if (isa(TheCall) || RI->getParent() != LastNewBlock) + BranchInst::Create(AfterCallBB, RI); RI->eraseFromParent(); } } else if (!Returns.empty()) { -- cgit v1.2.3-18-g5258