[llvm-commits] CVS: llvm/lib/VMCore/SymbolTable.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

SymbolTable.cpp updated: 1.39 -> 1.40

---
Log message:

Fix PR130, and testcase test/Regression/Linker/2003-11-18-TypeResolution.ll



---
Diffs of the changes:  (+7 -0)

Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.39 llvm/lib/VMCore/SymbolTable.cpp:1.40
--- llvm/lib/VMCore/SymbolTable.cpp:1.39	Tue Nov 11 16:41:34 2003
+++ llvm/lib/VMCore/SymbolTable.cpp	Tue Nov 18 19:02:52 2003
@@ -271,6 +271,13 @@
           else
             M->getGlobalList().remove(cast<GlobalVariable>(NewGV));
           delete NewGV;
+        } else {
+          // If they are not global values, they must be just random values who
+          // happen to conflict now that types have been resolved.  If this is
+          // the case, reinsert the value into the new plane, allowing it to get
+          // renamed.
+          assert(V.second->getType() == NewType &&"Type resolution is broken!");
+          insert(V.second);
         }
       } else {
         insertEntry(V.first, NewType, V.second);