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 | 845e582cbef44c27bd2565fb009739149a5288b6 (patch) | |
| tree | ea8b2994f19468131dc7ad0272e708265d61a608 /llvm/lib/Transforms/Utils | |
| parent | d71c20081c7769b6e65b8733b4f593d8ee7f21f8 (diff) | |
| download | bcm5719-llvm-845e582cbef44c27bd2565fb009739149a5288b6.tar.gz bcm5719-llvm-845e582cbef44c27bd2565fb009739149a5288b6.zip | |
Revert unintended commmit.
llvm-svn: 66001
Diffstat (limited to 'llvm/lib/Transforms/Utils')
| -rw-r--r-- | llvm/lib/Transforms/Utils/InlineFunction.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp index 9cd38cc55e0..a96c7ceaa8e 100644 --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp +++ b/llvm/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()) { |
