diff options
| author | Dale Johannesen <dalej@apple.com> | 2009-03-04 02:09:48 +0000 |
|---|---|---|
| committer | Dale Johannesen <dalej@apple.com> | 2009-03-04 02:09:48 +0000 |
| commit | 0744f09efc53d3352ac1caffc61f6e8239201c3b (patch) | |
| tree | c0a6fbc3f7020122ff62ae75293db22b0cf6c515 /lib/Transforms/Utils/InlineFunction.cpp | |
| parent | d9c05d7711b65bca070da76cb0e9a9b9eb7e69d5 (diff) | |
Revert unintended commmit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66001 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/InlineFunction.cpp')
| -rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 9cd38cc55e..a96c7ceaa8 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<ReturnInst*> Returns; ClonedCodeInfo InlinedFunctionInfo; - Function::iterator FirstNewBlock, LastNewBlock; + Function::iterator FirstNewBlock; { // Scope to destroy ValueMap after cloning. DenseMap<const Value*, Value*> ValueMap; @@ -312,7 +312,6 @@ 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) @@ -538,9 +537,7 @@ 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]; - // A return in the last block in the function falls through. -// if (isa<InvokeInst>(TheCall) || RI->getParent() != LastNewBlock) - BranchInst::Create(AfterCallBB, RI); + BranchInst::Create(AfterCallBB, RI); RI->eraseFromParent(); } } else if (!Returns.empty()) { |