replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

COFF: Find C++ mangled name for symbols starting with underscore. 

Symbol foo is mangled as _foo in C and ?foo@@... in C++ on x86.
findMangle has to remove prefix underscore before mangle a given name
as a C++ symbol.

llvm-svn: 241874
This commit is contained in:
Rui Ueyama 2015-07-09 23:03:51 +00:00
parent 81beefc541
commit 270960f5cd
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lld/COFF/SymbolTable.cpp
View File

@ -281,7 +281,14 @@ void SymbolTable::mangleMaybe(Undefined *U) {
return; return;
// In Microsoft ABI, a non-member function name is mangled this way. // In Microsoft ABI, a non-member function name is mangled this way.
std::string Prefix = ("?" + U->getName() + "@@Y").str(); std::string Prefix;
if (Config->is64()) {
Prefix = ("?" + U->getName() + "@@Y").str();
} else {
if (!U->getName().startswith("_"))
return;
Prefix = ("?" + U->getName().substr(1) + "@@Y").str();
}
for (auto Pair : Symtab) { for (auto Pair : Symtab) {
StringRef Name = Pair.first; StringRef Name = Pair.first;
if (!Name.startswith(Prefix)) if (!Name.startswith(Prefix))

4
lld/test/COFF/export32.test
View File

@ -10,7 +10,8 @@ CHECK1-NEXT: 0 0
CHECK1-NEXT: 1 0x1008 exportfn1 CHECK1-NEXT: 1 0x1008 exportfn1
CHECK1-NEXT: 2 0x1010 exportfn2 CHECK1-NEXT: 2 0x1010 exportfn2
# RUN: lld -flavor link2 /out:%t.dll /dll %t.obj /export:exportfn1,@5 /export:exportfn2 # RUN: lld -flavor link2 /out:%t.dll /dll %t.obj /export:exportfn1,@5 \
# RUN: /export:exportfn2 /export:mangled
# RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK2 %s # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK2 %s
CHECK2: Export Table: CHECK2: Export Table:
@ -24,6 +25,7 @@ CHECK2-NEXT: 4 0
CHECK2-NEXT: 5 0x1008 exportfn1 CHECK2-NEXT: 5 0x1008 exportfn1
CHECK2-NEXT: 6 0x1010 exportfn2 CHECK2-NEXT: 6 0x1010 exportfn2
CHECK2-NEXT: 7 0x1010 exportfn3 CHECK2-NEXT: 7 0x1010 exportfn3
CHECK2-NEXT: 8 0x1010 mangled
# RUN: lld -flavor link2 /out:%t.dll /dll %t.obj /export:exportfn1,@5,noname /export:exportfn2 # RUN: lld -flavor link2 /out:%t.dll /dll %t.obj /export:exportfn1,@5,noname /export:exportfn2
# RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK3 %s # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK3 %s