This is an archive of the discontinued LLVM Phabricator instance.

Differential D70780

[WebAssembly] Find wasm-opt with GetProgramPath
ClosedPublic

Authored by sunfish on Nov 27 2019, 6:08 AM.

Details

Reviewers
dschuff
ilya-biryukov
Commits
rG8f1e2151b8e9: [WebAssembly] Find wasm-opt with GetProgramPath
Summary

Instead of just searching for wasm-opt in PATH, use GetProgramPath, which checks the COMPILER_PATH environment variable, -B paths, and `PATH.

Diff Detail

Event Timeline

sunfish created this revision.Nov 27 2019, 6:08 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 27 2019, 6:09 AM
Herald added subscribers: cfe-commits, aheejin, jgravelle-google, sbc100. · View Herald Transcript
dschuff accepted this revision.Dec 2 2019, 9:34 AM
This revision is now accepted and ready to land.Dec 2 2019, 9:34 AM
Closed by commit rG8f1e2151b8e9: [WebAssembly] Find wasm-opt with GetProgramPath (authored by • sunfishcode). · Explain WhyDec 2 2019, 11:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
8 lines

Diff 231746

clang/lib/Driver/ToolChains/WebAssembly.cpp

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Lines if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
AddRunTimeLibs(ToolChain, ToolChain.getDriver(), CmdArgs, Args); AddRunTimeLibs(ToolChain, ToolChain.getDriver(), CmdArgs, Args);
} }
CmdArgs.push_back("-o"); CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
C.addCommand(std::make_unique<Command>(JA, *this, Linker, CmdArgs, Inputs)); C.addCommand(std::make_unique<Command>(JA, *this, Linker, CmdArgs, Inputs));
// When optimizing, if wasm-opt is in the PATH, run wasm-opt. // When optimizing, if wasm-opt is available, run it.
if (Arg *A = Args.getLastArg(options::OPT_O_Group)) { if (Arg *A = Args.getLastArg(options::OPT_O_Group)) {
if (llvm::ErrorOr<std::string> WasmOptPath = auto WasmOptPath = getToolChain().GetProgramPath("wasm-opt");
llvm::sys::findProgramByName("wasm-opt")) { if (WasmOptPath != "wasm-opt") {
StringRef OOpt = "s"; StringRef OOpt = "s";
if (A->getOption().matches(options::OPT_O4) || if (A->getOption().matches(options::OPT_O4) ||
A->getOption().matches(options::OPT_Ofast)) A->getOption().matches(options::OPT_Ofast))
OOpt = "4"; OOpt = "4";
else if (A->getOption().matches(options::OPT_O0)) else if (A->getOption().matches(options::OPT_O0))
OOpt = "0"; OOpt = "0";
else if (A->getOption().matches(options::OPT_O)) else if (A->getOption().matches(options::OPT_O))
OOpt = A->getValue(); OOpt = A->getValue();
if (OOpt != "0") { if (OOpt != "0") {
const char *WasmOpt = Args.MakeArgString(*WasmOptPath); const char *WasmOpt = Args.MakeArgString(WasmOptPath);
ArgStringList CmdArgs; ArgStringList CmdArgs;
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
CmdArgs.push_back(Args.MakeArgString(llvm::Twine("-O") + OOpt)); CmdArgs.push_back(Args.MakeArgString(llvm::Twine("-O") + OOpt));
CmdArgs.push_back("-o"); CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
C.addCommand(std::make_unique<Command>(JA, *this, WasmOpt, CmdArgs, Inputs)); C.addCommand(std::make_unique<Command>(JA, *this, WasmOpt, CmdArgs, Inputs));
} }
} }
▲ Show 20 Lines • Show All 222 Lines • Show Last 20 Lines