Instead of demangling symbol name by hand, use original name, which was
used to mangle symbol name, directly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30124 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp
index df9634e..e49364e 100644
--- a/tools/lto/lto.cpp
+++ b/tools/lto/lto.cpp
@@ -147,6 +147,7 @@
LLVMSymbol *newSymbol = new LLVMSymbol(lt, v, v->getName(),
mangler.getValueName(v));
symbols[newSymbol->getMangledName()] = newSymbol;
+ allSymbols[newSymbol->getMangledName()] = newSymbol;
for (unsigned count = 0, total = v->getNumOperands();
count != total; ++count)
@@ -291,8 +292,9 @@
// seen by linker.
for (unsigned i = 0, e = exportList.size(); i != e; ++i) {
const char *name = exportList[i];
- if (strlen(name) > 2 && name[0] == '_')
- exportList[i] = &name[1];
+ NameToSymbolMap::iterator itr = allSymbols.find(name);
+ if (itr != allSymbols.end())
+ exportList[i] = allSymbols[name]->getName();
}
sys::Path tmpAsmFilePath("/tmp/");