Skip to content

[nfc][clang-offload-bundler] Don't leak on exit(1) #119178

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
Dec 9, 2024
Merged

[nfc][clang-offload-bundler] Don't leak on exit(1) #119178

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
94 changes: 47 additions & 47 deletions clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,14 @@ int main(int argc, const char **argv) {

auto reportError = [argv](Error E) {
logAllUnhandledErrors(std::move(E), WithColor::error(errs(), argv[0]));
exit(1);
return 1;
};

auto doWork = [&](std::function<llvm::Error()> Work) {
if (llvm::Error Err = Work()) {
reportError(std::move(Err));
return reportError(std::move(Err));
}
return 0;
};

auto warningOS = [argv]() -> raw_ostream & {
Expand All @@ -223,14 +224,14 @@ int main(int argc, const char **argv) {
if (!Objcopy)
Objcopy = sys::findProgramByName("llvm-objcopy");
if (!Objcopy)
reportError(createStringError(Objcopy.getError(),
"unable to find 'llvm-objcopy' in path"));
return reportError(createStringError(
Objcopy.getError(), "unable to find 'llvm-objcopy' in path"));
else
BundlerConfig.ObjcopyPath = *Objcopy;

if (InputFileNames.getNumOccurrences() != 0 &&
InputFileNamesDeprecatedOpt.getNumOccurrences() != 0) {
reportError(createStringError(
return reportError(createStringError(
errc::invalid_argument,
"-inputs and -input cannot be used together, use only -input instead"));
}
Expand All @@ -246,9 +247,9 @@ int main(int argc, const char **argv) {

if (OutputFileNames.getNumOccurrences() != 0 &&
OutputFileNamesDeprecatedOpt.getNumOccurrences() != 0) {
reportError(createStringError(errc::invalid_argument,
"-outputs and -output cannot be used "
"together, use only -output instead"));
return reportError(createStringError(errc::invalid_argument,
"-outputs and -output cannot be used "
"together, use only -output instead"));
}

if (OutputFileNamesDeprecatedOpt.size()) {
Expand All @@ -262,77 +263,77 @@ int main(int argc, const char **argv) {

if (ListBundleIDs) {
if (Unbundle) {
reportError(
return reportError(
createStringError(errc::invalid_argument,
"-unbundle and -list cannot be used together"));
}
if (InputFileNames.size() != 1) {
reportError(createStringError(errc::invalid_argument,
"only one input file supported for -list"));
return reportError(createStringError(
errc::invalid_argument, "only one input file supported for -list"));
}
if (OutputFileNames.size()) {
reportError(createStringError(errc::invalid_argument,
"-outputs option is invalid for -list"));
return reportError(createStringError(
errc::invalid_argument, "-outputs option is invalid for -list"));
}
if (TargetNames.size()) {
reportError(createStringError(errc::invalid_argument,
"-targets option is invalid for -list"));
return reportError(createStringError(
errc::invalid_argument, "-targets option is invalid for -list"));
}

doWork([&]() { return OffloadBundler::ListBundleIDsInFile(
InputFileNames.front(),
BundlerConfig); });
return 0;
return doWork([&]() {
return OffloadBundler::ListBundleIDsInFile(InputFileNames.front(),
BundlerConfig);
});
}

if (BundlerConfig.CheckInputArchive) {
if (!Unbundle) {
reportError(createStringError(errc::invalid_argument,
"-check-input-archive cannot be used while "
"bundling"));
return reportError(createStringError(
errc::invalid_argument, "-check-input-archive cannot be used while "
"bundling"));
}
if (Unbundle && BundlerConfig.FilesType != "a") {
reportError(createStringError(errc::invalid_argument,
"-check-input-archive can only be used for "
"unbundling archives (-type=a)"));
return reportError(createStringError(
errc::invalid_argument, "-check-input-archive can only be used for "
"unbundling archives (-type=a)"));
}
}

if (OutputFileNames.size() == 0) {
reportError(
return reportError(
createStringError(errc::invalid_argument, "no output file specified!"));
}

if (TargetNames.getNumOccurrences() == 0) {
reportError(createStringError(
return reportError(createStringError(
errc::invalid_argument,
"for the --targets option: must be specified at least once!"));
}

if (Unbundle) {
if (InputFileNames.size() != 1) {
reportError(createStringError(
return reportError(createStringError(
errc::invalid_argument,
"only one input file supported in unbundling mode"));
}
if (OutputFileNames.size() != TargetNames.size()) {
reportError(createStringError(errc::invalid_argument,
"number of output files and targets should "
"match in unbundling mode"));
return reportError(createStringError(
errc::invalid_argument, "number of output files and targets should "
"match in unbundling mode"));
}
} else {
if (BundlerConfig.FilesType == "a") {
reportError(createStringError(errc::invalid_argument,
"Archive files are only supported "
"for unbundling"));
return reportError(createStringError(errc::invalid_argument,
"Archive files are only supported "
"for unbundling"));
}
if (OutputFileNames.size() != 1) {
reportError(createStringError(
errc::invalid_argument,
"only one output file supported in bundling mode"));
return reportError(
createStringError(errc::invalid_argument,
"only one output file supported in bundling mode"));
}
if (InputFileNames.size() != TargetNames.size()) {
reportError(createStringError(
return reportError(createStringError(
errc::invalid_argument,
"number of input files and targets should match in bundling mode"));
}
Expand All @@ -350,8 +351,8 @@ int main(int argc, const char **argv) {
std::vector<std::string> StandardizedTargetNames;
for (StringRef Target : TargetNames) {
if (!ParsedTargets.insert(Target).second) {
reportError(createStringError(errc::invalid_argument,
"Duplicate targets are not allowed"));
return reportError(createStringError(
errc::invalid_argument, "Duplicate targets are not allowed"));
}

auto OffloadInfo = OffloadTargetInfo(Target, BundlerConfig);
Expand All @@ -368,7 +369,7 @@ int main(int argc, const char **argv) {
Msg << ", unknown offloading kind '" << OffloadInfo.OffloadKind << "'";
if (!TripleIsValid)
Msg << ", unknown target triple '" << OffloadInfo.Triple.str() << "'";
reportError(createStringError(errc::invalid_argument, Msg.str()));
return reportError(createStringError(errc::invalid_argument, Msg.str()));
}

TargetIDs[OffloadInfo.OffloadKind.str() + "-" + OffloadInfo.Triple.str()]
Expand All @@ -395,7 +396,7 @@ int main(int argc, const char **argv) {
Msg << "Cannot bundle inputs with conflicting targets: '"
<< TargetID.first + "-" + ConflictingTID->first << "' and '"
<< TargetID.first + "-" + ConflictingTID->second << "'";
reportError(createStringError(errc::invalid_argument, Msg.str()));
return reportError(createStringError(errc::invalid_argument, Msg.str()));
}
}

Expand All @@ -408,14 +409,14 @@ int main(int argc, const char **argv) {
// treat missing host triple as error if we do unbundling.
if ((Unbundle && HostTargetNum > 1) ||
(!Unbundle && HostTargetNum != 1 && !BundlerConfig.AllowNoHost)) {
reportError(createStringError(errc::invalid_argument,
"expecting exactly one host target but got " +
Twine(HostTargetNum)));
return reportError(createStringError(
errc::invalid_argument,
"expecting exactly one host target but got " + Twine(HostTargetNum)));
}

OffloadBundler Bundler(BundlerConfig);

doWork([&]() {
return doWork([&]() {
if (Unbundle) {
if (BundlerConfig.FilesType == "a")
return Bundler.UnbundleArchive();
Expand All @@ -424,5 +425,4 @@ int main(int argc, const char **argv) {
} else
return Bundler.BundleFiles();
});
return 0;
}
Loading