summaryrefslogtreecommitdiff
path: root/lib/VMCore/SymbolTable.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/VMCore/SymbolTable.cpp')
-rw-r--r--lib/VMCore/SymbolTable.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp
index 8d6df2c787..b8da428a2c 100644
--- a/lib/VMCore/SymbolTable.cpp
+++ b/lib/VMCore/SymbolTable.cpp
@@ -133,9 +133,14 @@ Value *SymbolTable::removeEntry(iterator Plane, type_iterator Entry) {
// name...
//
void SymbolTable::insertEntry(const string &Name, const Type *VTy, Value *V) {
- // TODO: The typeverifier should catch this when its implemented
- assert(lookup(VTy, Name) == 0 &&
- "SymbolTable::insertEntry - Name already in symbol table!");
+ // Check to see if there is a naming conflict. If so, rename this value!
+ if (lookup(VTy, Name)) {
+ string UniqueName = getUniqueName(VTy, Name);
+ InternallyInconsistent = true;
+ V->setName(UniqueName, this);
+ InternallyInconsistent = false;
+ return;
+ }
#if DEBUG_SYMBOL_TABLE
cerr << this << " Inserting definition: " << Name << ": "