Convert a runtime check into an assertion

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

diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp
index 12bf0c7f1baa3fe14f76dfde3959ef39097253fc..4317968d4cdba654e71d4141a49ea24d9a09c9ff 100644 (file)
--- a/lib/VMCore/SymbolTable.cpp
+++ b/lib/VMCore/SymbolTable.cpp
@@ -123,11 +123,8 @@ void SymbolTable::insertEntry(const string &Name, Value *V) {
   const Type *VTy = V->getType();
 
   // TODO: The typeverifier should catch this when its implemented
-  if (lookup(VTy, Name)) {
-    cerr << "SymbolTable ERROR: Name already in symbol table: '" 
-         << Name << "' for type '" << VTy->getDescription() << "'\n";
-    abort();  // TODO: REMOVE THIS
-  }
+  assert(lookup(VTy, Name) == 0 && 
+        "SymbolTable::insertEntry - Name already in symbol table!");
 
 #if DEBUG_SYMBOL_TABLE
   cerr << this << " Inserting definition: " << Name << ": " 
@@ -173,3 +170,29 @@ void SymbolTable::refineAbstractType(const DerivedType *OldType,
        cast<const DerivedType>(NewType)->addAbstractTypeUser(this);
     }
 }
+
+
+#ifndef NDEBUG
+#include "llvm/Assembly/Writer.h"
+#include <algorithm>
+
+static void DumpVal(const pair<const string, Value *> &V) {
+  cout << "  '%" << V.first << "' = " << V.second << endl;
+}
+
+static void DumpPlane(const pair<const Type *, map<const string, Value *> >&P) {
+  cout << "  Plane: " << P.first << endl;
+  for_each(P.second.begin(), P.second.end(), DumpVal);
+}
+
+void SymbolTable::dump() const {
+  cout << "Symbol table dump:\n";
+  for_each(begin(), end(), DumpPlane);
+
+  if (ParentSymTab) {
+    cout << "Parent ";
+    ParentSymTab->dump();
+  }
+}
+
+#endif