From b3cdde6d77eadb722aff894b1d90498ce70babc2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 14 Jul 2009 18:17:16 +0000 Subject: Reapply my previous asmprinter changes now with more testing and two additional bug fixes: 1. The bug that everyone hit was a problem in the asmprinter where it would remove $stub but keep the L prefix on a name when emitting the indirect symbol. This is easy to fix by keeping the name of the stub and the name of the symbol in a StringMap instead of just keeping a StringSet and trying to reconstruct it late. 2. There was a problem printing the personality function. The current logic to print out the personality function from the DWARF information is a bit of a cesspool right now that duplicates a bunch of other logic in the asm printer. The short version of it is that it depends on emitting both the L and _ prefix for symbols (at least on darwin) and until I can untangle it, it is best to switch the mangler back to emitting both prefixes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75646 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/lto/LTOCodeGenerator.cpp | 4 ++-- tools/lto/LTOModule.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/lto') diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index 801707f..26effa5 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -371,13 +371,13 @@ void LTOCodeGenerator::applyScopeRestrictions() for (Module::iterator f = mergedModule->begin(), e = mergedModule->end(); f != e; ++f) { if ( !f->isDeclaration() - && _mustPreserveSymbols.count(mangler.getValueName(f)) ) + && _mustPreserveSymbols.count(mangler.getMangledName(f)) ) mustPreserveList.push_back(::strdup(f->getName().c_str())); } for (Module::global_iterator v = mergedModule->global_begin(), e = mergedModule->global_end(); v != e; ++v) { if ( !v->isDeclaration() - && _mustPreserveSymbols.count(mangler.getValueName(v)) ) + && _mustPreserveSymbols.count(mangler.getMangledName(v)) ) mustPreserveList.push_back(::strdup(v->getName().c_str())); } passes.add(createInternalizePass(mustPreserveList)); diff --git a/tools/lto/LTOModule.cpp b/tools/lto/LTOModule.cpp index c4980d6..38ee1cc 100644 --- a/tools/lto/LTOModule.cpp +++ b/tools/lto/LTOModule.cpp @@ -332,7 +332,7 @@ void LTOModule::addDefinedSymbol(GlobalValue* def, Mangler &mangler, return; // string is owned by _defines - const char* symbolName = ::strdup(mangler.getValueName(def).c_str()); + const char* symbolName = ::strdup(mangler.getMangledName(def).c_str()); // set alignment part log2() can have rounding errors uint32_t align = def->getAlignment(); @@ -405,7 +405,7 @@ void LTOModule::addPotentialUndefinedSymbol(GlobalValue* decl, Mangler &mangler) if (isa(decl)) return; - const char* name = mangler.getValueName(decl).c_str(); + const char* name = mangler.getMangledName(decl).c_str(); // we already have the symbol if (_undefines.find(name) != _undefines.end()) -- cgit v1.1