Fix problem where subpasses would invalidate all analyses outstanding

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

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index a41262d0c64caa3ff0077bab7e88d9a107cc70ea..da3d87f9d2e7b7c4d623b7630a1767db3e738e33 100644 (file)
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -1,26 +1,25 @@
 //===-- Value.cpp - Implement the Value class -----------------------------===//
 //
-// This file implements the Value, User, and SymTabValue classes. 
+// This file implements the Value and User classes. 
 //
 //===----------------------------------------------------------------------===//
 
-#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,8 +32,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,6 +46,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
@@ -51,8 +56,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!");
   }
@@ -64,7 +73,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;
 }
 
@@ -83,12 +94,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) {
 }
 
@@ -108,42 +118,3 @@ void User::replaceUsesOfWith(Value *From, Value *To) {
 }
 
 
-//===----------------------------------------------------------------------===//
-//                             SymTabValue Class
-//===----------------------------------------------------------------------===//
-
-SymTabValue::SymTabValue(Value *p) : ValueParent(p) { 
-  assert(ValueParent && "SymTavValue without parent!?!");
-  ParentSymTab = SymTab = 0;
-}
-
-
-SymTabValue::~SymTabValue() {
-  delete SymTab;
-}
-
-void SymTabValue::setParentSymTab(SymbolTable *ST) {
-  ParentSymTab = ST;
-  if (SymTab) 
-    SymTab->setParentSymTab(ST);
-}
-
-SymbolTable *SymTabValue::getSymbolTableSure() {
-  if (!SymTab) SymTab = new SymbolTable(ParentSymTab);
-  return SymTab;
-}
-
-// hasSymbolTable() - Returns true if there is a symbol table allocated to
-// this object AND if there is at least one name in it!
-//
-bool SymTabValue::hasSymbolTable() const {
-  if (!SymTab) return false;
-
-  for (SymbolTable::const_iterator I = SymTab->begin(); 
-       I != SymTab->end(); ++I) {
-    if (I->second.begin() != I->second.end())
-      return true;                                // Found nonempty type plane!
-  }
-  
-  return false;
-}