Skip to content

[llvm-dlltool][NFC] Factor out parseModuleDefinition helper. #81620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2024
Merged

[llvm-dlltool][NFC] Factor out parseModuleDefinition helper. #81620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 52 additions & 38 deletions llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,46 @@ std::optional<std::string> getPrefix(StringRef Argv0) {
return ProgName.str();
}

bool parseModuleDefinition(StringRef DefFileName, MachineTypes Machine,
bool AddUnderscores,
std::vector<COFFShortExport> &Exports,
std::string &OutputFile) {
std::unique_ptr<MemoryBuffer> MB = openFile(DefFileName);
if (!MB)
return false;

if (!MB->getBufferSize()) {
llvm::errs() << "definition file empty\n";
return false;
}

Expected<COFFModuleDefinition> Def = parseCOFFModuleDefinition(
*MB, Machine, /*MingwDef=*/true, AddUnderscores);
if (!Def) {
llvm::errs() << "error parsing definition\n"
<< errorToErrorCode(Def.takeError()).message() << "\n";
return false;
}

if (OutputFile.empty())
OutputFile = std::move(Def->OutputFile);

// If ExtName is set (if the "ExtName = Name" syntax was used), overwrite
// Name with ExtName and clear ExtName. When only creating an import
// library and not linking, the internal name is irrelevant. This avoids
// cases where writeImportLibrary tries to transplant decoration from
// symbol decoration onto ExtName.
for (COFFShortExport &E : Def->Exports) {
if (!E.ExtName.empty()) {
E.Name = E.ExtName;
E.ExtName.clear();
}
}

Exports = std::move(Def->Exports);
return true;
}

} // namespace

int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
Expand Down Expand Up @@ -141,16 +181,6 @@ int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
return 1;
}

std::unique_ptr<MemoryBuffer> MB =
openFile(Args.getLastArg(OPT_d)->getValue());
if (!MB)
return 1;

if (!MB->getBufferSize()) {
llvm::errs() << "definition file empty\n";
return 1;
}

COFF::MachineTypes Machine = getDefaultMachine();
if (std::optional<std::string> Prefix = getPrefix(ArgsArr[0])) {
Triple T(*Prefix);
Expand All @@ -166,40 +196,23 @@ int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
}

bool AddUnderscores = !Args.hasArg(OPT_no_leading_underscore);
Expected<COFFModuleDefinition> Def = parseCOFFModuleDefinition(
*MB, Machine, /*MingwDef=*/true, AddUnderscores);

if (!Def) {
llvm::errs() << "error parsing definition\n"
<< errorToErrorCode(Def.takeError()).message() << "\n";
return 1;
}

// Do this after the parser because parseCOFFModuleDefinition sets OutputFile.
std::string OutputFile;
if (auto *Arg = Args.getLastArg(OPT_D))
Def->OutputFile = Arg->getValue();
OutputFile = Arg->getValue();

if (Def->OutputFile.empty()) {
llvm::errs() << "no DLL name specified\n";
std::vector<COFFShortExport> Exports;
if (!parseModuleDefinition(Args.getLastArg(OPT_d)->getValue(), Machine,
AddUnderscores, Exports, OutputFile))
return 1;
}

std::string Path = std::string(Args.getLastArgValue(OPT_l));

// If ExtName is set (if the "ExtName = Name" syntax was used), overwrite
// Name with ExtName and clear ExtName. When only creating an import
// library and not linking, the internal name is irrelevant. This avoids
// cases where writeImportLibrary tries to transplant decoration from
// symbol decoration onto ExtName.
for (COFFShortExport& E : Def->Exports) {
if (!E.ExtName.empty()) {
E.Name = E.ExtName;
E.ExtName.clear();
}
if (OutputFile.empty()) {
llvm::errs() << "no DLL name specified\n";
return 1;
}

if (Machine == IMAGE_FILE_MACHINE_I386 && Args.hasArg(OPT_k)) {
for (COFFShortExport& E : Def->Exports) {
for (COFFShortExport &E : Exports) {
if (!E.AliasTarget.empty() || (!E.Name.empty() && E.Name[0] == '?'))
continue;
E.SymbolName = E.Name;
Expand All @@ -215,8 +228,9 @@ int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
}
}

if (!Path.empty() && writeImportLibrary(Def->OutputFile, Path, Def->Exports,
Machine, /*MinGW=*/true))
std::string Path = std::string(Args.getLastArgValue(OPT_l));
if (!Path.empty() && writeImportLibrary(OutputFile, Path, Exports, Machine,
/*MinGW=*/true))
return 1;
return 0;
}