[llvm-commits] [llvm] r66001 - /llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp

[Dale Johannesen]

Author: johannes
Date: Tue Mar  3 20:09:48 2009
New Revision: 66001

URL: http://llvm.org/viewvc/llvm-project?rev=66001&view=rev
Log:
Revert unintended commmit.


Modified:
    llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp

Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=66001&r1=66000&r2=66001&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Tue Mar  3 20:09:48 2009
@@ -235,7 +235,7 @@
   // 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 @@
 
     // 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 @@
     // 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()) {