From 652f032ce9d57dbe613bbd57f76e1f54056e6b11 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 29 Aug 2003 04:49:54 +0000 Subject: [PATCH] Fix bug: Linker/2003-08-28-TypeResolvesGlobal.ll git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8202 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/VMCore/SymbolTable.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp index ddd769d075f..b5476178db8 100644 --- a/lib/VMCore/SymbolTable.cpp +++ b/lib/VMCore/SymbolTable.cpp @@ -231,11 +231,21 @@ void SymbolTable::refineAbstractType(const DerivedType *OldType, GlobalValue *ExistGV = dyn_cast(TI->second); GlobalValue *NewGV = dyn_cast(V.second); - if (ExistGV && NewGV && ExistGV->isExternal() && NewGV->isExternal()) { + if (ExistGV && NewGV) { + assert((ExistGV->isExternal() || NewGV->isExternal()) && + "Two planes folded together with overlapping value names!"); + + // Make sure that ExistGV is the one we want to keep! + if (!NewGV->isExternal() || !NewGV->use_empty()) { + std::swap(NewGV, ExistGV); + } + // Ok we have two external global values. Make all uses of the new // one use the old one... // - assert(ExistGV->use_empty() && "No uses allowed on untyped value!"); + assert(NewGV->use_empty() && "No uses allowed on untyped value!"); + + // We cannot replaceAllUsesWith, because they have different types! //NewGV->replaceAllUsesWith(ExistGV); // Now we just convert it to an unnamed method... which won't get @@ -261,10 +271,6 @@ void SymbolTable::refineAbstractType(const DerivedType *OldType, else M->getGlobalList().remove(cast(NewGV)); delete NewGV; - - } else { - assert(0 && "Two planes folded together with overlapping " - "value names!"); } } else { insertEntry(V.first, NewType, V.second);