* Incorporate the contents of SymTabValue into Function and Module

[oota-llvm.git] / lib / VMCore / Value.cpp

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index 79d8e0a46205f292cf839e122648b1fb04137120..1309c566ad8b9408c9f610f5c20da8fa8b929a61 100644 (file)
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -1,27 +1,26 @@
 //===-- Value.cpp - Implement the Value class -----------------------------===//
 //
-// This file implements the Value class. 
+// This file implements the Value, User, and SymTabValue classes. 
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ValueHolderImpl.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/SymTabValue.h"
-#include "llvm/ConstantPool.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;
+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;
 }
 
@@ -34,8 +33,12 @@ Value::~Value() {
   // a <badref>
   //
   if (Uses.begin() != Uses.end()) {
-    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());
@@ -43,21 +46,40 @@ 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.front();
+    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)
-      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!");
   }
 }
 
+// refineAbstractType - This function is implemented because we use
+// potentially abstract types, and these types may be resolved to more
+// concrete types after we are constructed.  For the value class, we simply
+// 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!");
+  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);
@@ -73,12 +95,11 @@ User *Value::use_remove(use_iterator &I) {
   return i;
 }
 
-
 //===----------------------------------------------------------------------===//
 //                                 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) {
 }
 
@@ -88,14 +109,13 @@ User::User(const Type *Ty, ValueTy vty, const string &name)
 void User::replaceUsesOfWith(Value *From, Value *To) {
   if (From == To) return;   // Duh what?
 
-  for (unsigned OpNum = 0; Value *D = getOperand(OpNum); ++OpNum) {   
-    if (D == From) {  // Okay, this operand is pointing to our fake def.
+  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
       // "To", adding "this" to the uses list of To, and
       // most importantly, removing "this" from the use list of "From".
-      setOperand(OpNum, To); // Fix it now...
+      setOperand(i, To); // Fix it now...
     }
-  }
 }
 
 
@@ -103,22 +123,13 @@ void User::replaceUsesOfWith(Value *From, Value *To) {
 //                             SymTabValue Class
 //===----------------------------------------------------------------------===//
 
-// Instantiate Templates - This ugliness is the price we have to pay
-// for having a ValueHolderImpl.h file seperate from ValueHolder.h!  :(
-//
-template class ValueHolder<ConstPoolVal, SymTabValue>;
-
-SymTabValue::SymTabValue(const Type *Ty, ValueTy dty, const string &name = "") 
-  : Value(Ty, dty, name), ConstPool(this) { 
+SymTabValue::SymTabValue(Value *p) : ValueParent(p) { 
+  assert(ValueParent && "SymTavValue without parent!?!");
   ParentSymTab = SymTab = 0;
 }
 
 
 SymTabValue::~SymTabValue() {
-  ConstPool.dropAllReferences();
-  ConstPool.delete_all();
-  ConstPool.setParent(0);
-
   delete SymTab;
 }