X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FValue.cpp;h=ac13159e30aa9f5d53930b055a1c6dcf827aa25e;hb=7b13f56c36eb7572e1053974e5487a5f1c3080aa;hp=3ac0f107218ed037604f40267d01fed3dc07503a;hpb=d05e22cb6f7b5dfbc50d95ddc0165674320c0e01;p=oota-llvm.git

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index 3ac0f107218..ac13159e30a 100644
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -7,8 +7,10 @@
 #include "llvm/InstrTypes.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/Constant.h"
+#include "Support/LeakDetector.h"
 #include <algorithm>
-#include <iostream>
+
 //===----------------------------------------------------------------------===//
 //                                Value Class
 //===----------------------------------------------------------------------===//
@@ -18,7 +20,7 @@ static inline const Type *checkType(const Type *Ty) {
   return Ty;
 }
 
-Value::Value(const Type *ty, ValueTy vty, const std::string &name = "")
+Value::Value(const Type *ty, ValueTy vty, const std::string &name)
   : Name(name), Ty(checkType(ty), this) {
   VTy = vty;
 }
@@ -33,37 +35,34 @@ Value::~Value() {
   //
   if (Uses.begin() != Uses.end()) {
     std::cerr << "While deleting: " << Ty << "%" << Name << "\n";
-    for (use_const_iterator I = Uses.begin(); I != Uses.end(); ++I) {
-      std::cerr << "Use still stuck around after Def is destroyed:";
-      (*I)->dump();
-      std::cerr << "\n";
-    }
+    for (use_const_iterator I = Uses.begin(); I != Uses.end(); ++I)
+      std::cerr << "Use still stuck around after Def is destroyed:"
+                << **I << "\n";
   }
 #endif
   assert(Uses.begin() == Uses.end());
+
+  // There should be no uses of this object anymore, remove it.
+  LeakDetector::removeGarbageObject(this);
 }
 
-void Value::replaceAllUsesWith(Value *D) {
-  assert(D && "Value::replaceAllUsesWith(<null>) is invalid!");
-  assert(D != this && "V->replaceAllUsesWith(V) is NOT valid!");
-  assert(D->getType() == getType() &&
+
+
+
+void Value::replaceAllUsesWith(Value *New) {
+  assert(New && "Value::replaceAllUsesWith(<null>) is invalid!");
+  assert(New != this && "this->replaceAllUsesWith(this) is NOT valid!");
+  assert(New->getType() == getType() &&
          "replaceAllUses of value with new value of different type!");
   while (!Uses.empty()) {
     User *Use = Uses.back();
-#ifndef NDEBUG
-    unsigned NumUses = Uses.size();
-#endif
-    Use->replaceUsesOfWith(this, D);
-
-#ifndef NDEBUG      // only in -g mode...
-    if (Uses.size() == NumUses) {
-      std::cerr << "Use: ";
-      Use->dump();
-      std::cerr << "replace with: ";
-      D->dump(); 
+    // Must handle Constants specially, we cannot call replaceUsesOfWith on a
+    // constant!
+    if (Constant *C = dyn_cast<Constant>(Use)) {
+      C->replaceUsesOfWithOnConstant(this, New);
+    } else {
+      Use->replaceUsesOfWith(this, New);
     }
-#endif
-    assert(Uses.size() != NumUses && "Didn't remove definition!");
   }
 }
 
@@ -73,25 +72,25 @@ void Value::replaceAllUsesWith(Value *D) {
 // change Ty to point to the right type.  :)
 //
 void Value::refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
-  assert(Ty.get() == OldTy &&"Can't refine anything but my type!");
+  assert(Ty.get() == OldTy && "Can't refine anything but my type!");
   if (OldTy == NewTy && !OldTy->isAbstract())
     Ty.removeUserFromConcrete();
   Ty = NewTy;
 }
 
-void Value::killUse(User *i) {
-  if (i == 0) return;
-  use_iterator I = find(Uses.begin(), Uses.end(), i);
+void Value::killUse(User *U) {
+  if (U == 0) return;
+  unsigned i;
 
-  assert(I != Uses.end() && "Use not in uses list!!");
-  Uses.erase(I);
-}
+  // Scan backwards through the uses list looking for the user.  We do this
+  // because vectors like to be accessed on the end.  This is incredibly
+  // important from a performance perspective.
+  for (i = Uses.size()-1; Uses[i] != U; --i)
+    /* empty */;
 
-User *Value::use_remove(use_iterator &I) {
-  assert(I != Uses.end() && "Trying to remove the end of the use list!!!");
-  User *i = *I;
-  I = Uses.erase(I);
-  return i;
+  assert(i < Uses.size() && "Use not in uses list!!");
+  Uses[i] = Uses.back();
+  Uses.pop_back();
 }
 
 //===----------------------------------------------------------------------===//
@@ -108,6 +107,9 @@ User::User(const Type *Ty, ValueTy vty, const std::string &name)
 void User::replaceUsesOfWith(Value *From, Value *To) {
   if (From == To) return;   // Duh what?
 
+  assert(!isa<Constant>(this) &&
+         "Cannot call User::replaceUsesofWith on a constant!");
+
   for (unsigned i = 0, E = getNumOperands(); i != E; ++i)
     if (getOperand(i) == From) {  // Is This operand is pointing to oldval?
       // The side effects of this setOperand call include linking to
@@ -116,5 +118,3 @@ void User::replaceUsesOfWith(Value *From, Value *To) {
       setOperand(i, To); // Fix it now...
     }
 }
-
-