OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[COFF] Keep the underscore on exported decorated stdcall functions in MSVC mode 

This (together with the corresponding LLD commit, that contains the
testcase updates) fixes PR35733.

Differential Revision: https://reviews.llvm.org/D41631

llvm-svn: 323035
This commit is contained in:
Martin Storsjo 2018-01-20 11:44:32 +00:00
parent 990eb1fc94
commit f641d0d4f2
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/Object/COFFImportFile.h
View File

@ -98,7 +98,8 @@ struct COFFShortExport {
Error writeImportLibrary(StringRef ImportName, StringRef Path, Error writeImportLibrary(StringRef ImportName, StringRef Path,
ArrayRef<COFFShortExport> Exports, ArrayRef<COFFShortExport> Exports,
COFF::MachineTypes Machine, bool MakeWeakAliases); COFF::MachineTypes Machine, bool MakeWeakAliases,
bool MinGW);
} // namespace object } // namespace object
} // namespace llvm } // namespace llvm

15
llvm/lib/Object/COFFImportFile.cpp
View File

@ -91,7 +91,15 @@ static void writeStringTable(std::vector<uint8_t> &B,
} }
static ImportNameType getNameType(StringRef Sym, StringRef ExtName, static ImportNameType getNameType(StringRef Sym, StringRef ExtName,
MachineTypes Machine) { MachineTypes Machine, bool MinGW) {
// A decorated stdcall function in MSVC is exported with the
// type IMPORT_NAME, and the exported function name includes the
// the leading underscore. In MinGW on the other hand, a decorated
// stdcall function still omits the underscore (IMPORT_NAME_NOPREFIX).
// See the comment in isDecorated in COFFModuleDefinition.cpp for more
// details.
if (ExtName.startswith("_") && ExtName.contains('@') && !MinGW)
return IMPORT_NAME;
if (Sym != ExtName) if (Sym != ExtName)
return IMPORT_NAME_UNDECORATE; return IMPORT_NAME_UNDECORATE;
if (Machine == IMAGE_FILE_MACHINE_I386 && Sym.startswith("_")) if (Machine == IMAGE_FILE_MACHINE_I386 && Sym.startswith("_"))
@ -558,7 +566,8 @@ NewArchiveMember ObjectFactory::createWeakExternal(StringRef Sym,
Error writeImportLibrary(StringRef ImportName, StringRef Path, Error writeImportLibrary(StringRef ImportName, StringRef Path,
ArrayRef<COFFShortExport> Exports, ArrayRef<COFFShortExport> Exports,
MachineTypes Machine, bool MakeWeakAliases) { MachineTypes Machine, bool MakeWeakAliases,
bool MinGW) {
std::vector<NewArchiveMember> Members; std::vector<NewArchiveMember> Members;
ObjectFactory OF(llvm::sys::path::filename(ImportName), Machine); ObjectFactory OF(llvm::sys::path::filename(ImportName), Machine);
@ -589,7 +598,7 @@ Error writeImportLibrary(StringRef ImportName, StringRef Path,
ImportType = IMPORT_CONST; ImportType = IMPORT_CONST;
StringRef SymbolName = E.SymbolName.empty() ? E.Name : E.SymbolName; StringRef SymbolName = E.SymbolName.empty() ? E.Name : E.SymbolName;
ImportNameType NameType = getNameType(SymbolName, E.Name, Machine); ImportNameType NameType = getNameType(SymbolName, E.Name, Machine, MinGW);
Expected<std::string> Name = E.ExtName.empty() Expected<std::string> Name = E.ExtName.empty()
? SymbolName ? SymbolName
: replace(SymbolName, E.Name, E.ExtName); : replace(SymbolName, E.Name, E.ExtName);

2
llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
View File

@ -173,7 +173,7 @@ int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
} }
} }
if (writeImportLibrary(Def->OutputFile, Path, Def->Exports, Machine, true)) if (writeImportLibrary(Def->OutputFile, Path, Def->Exports, Machine, true, true))
return 1; return 1;
return 0; return 0;
} }