- Eliminated the deferred symbol table stuff in Module & Function, it really

    wasn't an optimization and it was causing lots of bugs.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4779 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp
index fcfda5d..8d9b314 100644
--- a/lib/Target/CBackend/Writer.cpp
+++ b/lib/Target/CBackend/Writer.cpp
@@ -485,10 +485,10 @@ bool CWriter::nameAllUsedStructureTypes(Module &M) {
   // Loop over the module symbol table, removing types from UT that are already
   // named.
   //
-  SymbolTable *MST = M.getSymbolTableSure();
-  if (MST->find(Type::TypeTy) != MST->end())
-    for (SymbolTable::type_iterator I = MST->type_begin(Type::TypeTy),
-           E = MST->type_end(Type::TypeTy); I != E; ++I)
+  SymbolTable &MST = M.getSymbolTable();
+  if (MST.find(Type::TypeTy) != MST.end())
+    for (SymbolTable::type_iterator I = MST.type_begin(Type::TypeTy),
+           E = MST.type_end(Type::TypeTy); I != E; ++I)
       UT.erase(cast<Type>(I->second));
 
   // UT now contains types that are not named.  Loop over it, naming structure
@@ -498,7 +498,7 @@ bool CWriter::nameAllUsedStructureTypes(Module &M) {
   for (std::set<const Type *>::const_iterator I = UT.begin(), E = UT.end();
        I != E; ++I)
     if (const StructType *ST = dyn_cast<StructType>(*I)) {
-      ((Value*)ST)->setName("unnamed", MST);
+      ((Value*)ST)->setName("unnamed", &MST);
       Changed = true;
     }
   return Changed;
@@ -547,8 +547,7 @@ void CWriter::printModule(Module *M) {
   //
 
   // Loop over the symbol table, emitting all named constants...
-  if (M->hasSymbolTable())
-    printSymbolTable(*M->getSymbolTable());
+  printSymbolTable(M->getSymbolTable());
 
   // Global variable declarations...
   if (!M->gempty()) {