*** empty log message ***

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2777 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 12 insertions, 31 deletions

diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp
index 89078a12e9..aea0b94e10 100644
--- a/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -15,19 +15,18 @@
 //
 void ReplaceInstWithValue(BasicBlock::InstListType &BIL,
                           BasicBlock::iterator &BI, Value *V) {
-  Instruction *I = *BI;
+  Instruction &I = *BI;
   // Replaces all of the uses of the instruction with uses of the value
-  I->replaceAllUsesWith(V);
+  I.replaceAllUsesWith(V);
 
-  // Remove the unneccesary instruction now...
-  BIL.remove(BI);
+  std::string OldName = I.getName();
+  
+  // Delete the unneccesary instruction now...
+  BI = BIL.erase(BI);
 
   // Make sure to propogate a name if there is one already...
-  if (I->hasName() && !V->hasName())
-    V->setName(I->getName(), BIL.getParent()->getSymbolTable());
-
-  // Remove the dead instruction now...
-  delete I;
+  if (OldName.size() && !V->hasName())
+    V->setName(OldName, BIL.getParent()->getSymbolTable());
 }
 
 
@@ -41,13 +40,13 @@ void ReplaceInstWithInst(BasicBlock::InstListType &BIL,
          "ReplaceInstWithInst: Instruction already inserted into basic block!");
 
   // Insert the new instruction into the basic block...
-  BI = BIL.insert(BI, I)+1;  // Increment BI to point to instruction to delete
+  BasicBlock::iterator New = BIL.insert(BI, I);
 
   // Replace all uses of the old instruction, and delete it.
   ReplaceInstWithValue(BIL, BI, I);
 
   // Move BI back to point to the newly inserted instruction
-  --BI;
+  BI = New;
 }
 
 // ReplaceInstWithInst - Replace the instruction specified by From with the
@@ -56,24 +55,6 @@ void ReplaceInstWithInst(BasicBlock::InstListType &BIL,
 // for the instruction.
 //
 void ReplaceInstWithInst(Instruction *From, Instruction *To) {
-  BasicBlock *BB = From->getParent();
-  BasicBlock::InstListType &BIL = BB->getInstList();
-  BasicBlock::iterator BI = find(BIL.begin(), BIL.end(), From);
-  assert(BI != BIL.end() && "Inst not in it's parents BB!");
-  ReplaceInstWithInst(BIL, BI, To);
+  BasicBlock::iterator BI(From);
+  ReplaceInstWithInst(From->getParent()->getInstList(), BI, To);
 }
-
-// InsertInstBeforeInst - Insert 'NewInst' into the basic block that 'Existing'
-// is already in, and put it right before 'Existing'.  This instruction should
-// only be used when there is no iterator to Existing already around.  The 
-// returned iterator points to the new instruction.
-//
-BasicBlock::iterator InsertInstBeforeInst(Instruction *NewInst,
-                                          Instruction *Existing) {
-  BasicBlock *BB = Existing->getParent();
-  BasicBlock::InstListType &BIL = BB->getInstList();
-  BasicBlock::iterator BI = find(BIL.begin(), BIL.end(), Existing);
-  assert(BI != BIL.end() && "Inst not in it's parents BB!");
-  return BIL.insert(BI, NewInst);
-}
-