fixed bug: test/Regression/Linker/2002-08-20-ConstantExpr.ll

[oota-llvm.git] / lib / Transforms / TransformInternals.cpp

diff --git a/lib/Transforms/TransformInternals.cpp b/lib/Transforms/TransformInternals.cpp
index e5a88c592f5d0ce13130f85db0d74350b58dcfab..f8476231cf9b3e6dfcd5bd370b6d77cbe4298e04 100644 (file)
--- a/lib/Transforms/TransformInternals.cpp
+++ b/lib/Transforms/TransformInternals.cpp
@@ -10,7 +10,6 @@
 #include "llvm/Analysis/Expressions.h"
 #include "llvm/Function.h"
 #include "llvm/iOther.h"
-#include <algorithm>
 
 // TargetData Hack: Eventually we will have annotations given to us by the
 // backend so that we know stuff about type size and alignments.  For now
@@ -18,69 +17,6 @@
 //
 const TargetData TD("LevelRaise: Should be GCC though!");
 
-// ReplaceInstWithValue - Replace all uses of an instruction (specified by BI)
-// with a value, then remove and delete the original instruction.
-//
-void ReplaceInstWithValue(BasicBlock::InstListType &BIL,
-                          BasicBlock::iterator &BI, Value *V) {
-  Instruction *I = *BI;
-  // Replaces all of the uses of the instruction with uses of the value
-  I->replaceAllUsesWith(V);
-
-  // Remove the unneccesary instruction now...
-  BIL.remove(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;
-}
-
-
-// ReplaceInstWithInst - Replace the instruction specified by BI with the
-// instruction specified by I.  The original instruction is deleted and BI is
-// updated to point to the new instruction.
-//
-void ReplaceInstWithInst(BasicBlock::InstListType &BIL,
-                         BasicBlock::iterator &BI, Instruction *I) {
-  assert(I->getParent() == 0 &&
-         "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
-
-  // 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;
-}
-
-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);
-}
-
-// 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);
-}
-
-
 
 static const Type *getStructOffsetStep(const StructType *STy, unsigned &Offset,
                                        std::vector<Value*> &Indices) {
@@ -116,7 +52,7 @@ static const Type *getStructOffsetStep(const StructType *STy, unsigned &Offset,
 //
 const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
                                 std::vector<Value*> &Indices,
-                                bool StopEarly = true) {
+                                bool StopEarly) {
   if (Offset == 0 && StopEarly && !Indices.empty())
     return Ty;    // Return the leaf type
 
@@ -151,7 +87,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
 //
 const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
                              std::vector<Value*> &Indices,
-                             BasicBlock::iterator *BI = 0) {
+                             BasicBlock::iterator *BI) {
   const CompositeType *CompTy = dyn_cast<CompositeType>(Ty);
   if (CompTy == 0) return 0;
 
@@ -204,12 +140,12 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
         Offset -= Index*ElSize;               // Consume part of the offset
 
         if (BI) {              // Generate code?
-          BasicBlock *BB = (**BI)->getParent();
+          BasicBlock *BB = (*BI)->getParent();
           if (Expr.Var->getType() != Type::UIntTy) {
             CastInst *IdxCast = new CastInst(Expr.Var, Type::UIntTy);
             if (Expr.Var->hasName())
               IdxCast->setName(Expr.Var->getName()+"-idxcast");
-            *BI = BB->getInstList().insert(*BI, IdxCast)+1;
+            *BI = ++BB->getInstList().insert(*BI, IdxCast);
             Expr.Var = IdxCast;
           }
 
@@ -222,7 +158,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
             if (Expr.Var->hasName())
               Scaler->setName(Expr.Var->getName()+"-scale");
 
-            *BI = BB->getInstList().insert(*BI, Scaler)+1;
+            *BI = ++BB->getInstList().insert(*BI, Scaler);
             Expr.Var = Scaler;
           }
 
@@ -232,7 +168,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
                                                            Expr.Var, IndexAmt);
             if (Expr.Var->hasName())
               Offseter->setName(Expr.Var->getName()+"-offset");
-            *BI = BB->getInstList().insert(*BI, Offseter)+1;
+            *BI = ++BB->getInstList().insert(*BI, Offseter);
             Expr.Var = Offseter;
           }
         }