X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FValue.cpp;h=1309c566ad8b9408c9f610f5c20da8fa8b929a61;hb=11aa4770fe38befb3926646cf9ea7ed0ff7e33a8;hp=d40aaca2773b67bbaa208fa1bc06347c566c3a2a;hpb=5efec2890119801f870159a59b15b116df0d070b;p=oota-llvm.git

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index d40aaca2773..1309c566ad8 100644
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -4,23 +4,23 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ValueHolderImpl.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/SymTabValue.h"
-#include "llvm/ConstPoolVals.h"
-#include "llvm/Type.h"
-#ifndef NDEBUG      // Only in -g mode...
-#include "llvm/Assembly/Writer.h"
-#endif
+#include "llvm/DerivedTypes.h"
 #include <algorithm>
 
 //===----------------------------------------------------------------------===//
 //                                Value Class
 //===----------------------------------------------------------------------===//
 
-Value::Value(const Type *ty, ValueTy vty, const string &name = "")
-  : Name(name), Ty(ty, this) {
+static inline const Type *checkType(const Type *Ty) {
+  assert(Ty && "Value defined with a null type: Error!");
+  return Ty;
+}
+
+Value::Value(const Type *ty, ValueTy vty, const std::string &name = "")
+  : Name(name), Ty(checkType(ty), this) {
   VTy = vty;
 }
 
@@ -33,9 +33,12 @@ Value::~Value() {
   // a <badref>
   //
   if (Uses.begin() != Uses.end()) {
-    cerr << "While deleting: " << this;
-    for (use_const_iterator I = Uses.begin(); I != Uses.end(); ++I)
-      cerr << "Use still stuck around after Def is destroyed:" << *I << endl;
+    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";
+    }
   }
 #endif
   assert(Uses.begin() == Uses.end());
@@ -44,6 +47,8 @@ Value::~Value() {
 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() &&
+         "replaceAllUses of value with new value of different type!");
   while (!Uses.empty()) {
     User *Use = Uses.back();
 #ifndef NDEBUG
@@ -52,8 +57,12 @@ void Value::replaceAllUsesWith(Value *D) {
     Use->replaceUsesOfWith(this, D);
 
 #ifndef NDEBUG      // only in -g mode...
-    if (Uses.size() == NumUses)
-      cerr << "Use: " << Use << "replace with: " << D; 
+    if (Uses.size() == NumUses) {
+      std::cerr << "Use: ";
+      Use->dump();
+      std::cerr << "replace with: ";
+      D->dump(); 
+    }
 #endif
     assert(Uses.size() != NumUses && "Didn't remove definition!");
   }
@@ -65,7 +74,9 @@ 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() == (const Type*)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;
 }
 
@@ -84,17 +95,11 @@ User *Value::use_remove(use_iterator &I) {
   return i;
 }
 
-#ifndef NDEBUG      // Only in -g mode...
-void Value::dump() const {
-  cerr << this;
-}
-#endif
-
 //===----------------------------------------------------------------------===//
 //                                 User Class
 //===----------------------------------------------------------------------===//
 
-User::User(const Type *Ty, ValueTy vty, const string &name) 
+User::User(const Type *Ty, ValueTy vty, const std::string &name) 
   : Value(Ty, vty, name) {
 }