This is an archive of the discontinued LLVM Phabricator instance.

Differential D111786

[Driver][WebAssembly] Use ToolChain reference instead of getToolChain().
ClosedPublic

Authored by fcambus on Oct 14 2021, 2:48 AM.

Details

Reviewers
sbc100
aheejin
Commits
rGf7a3214306cb: [Driver][WebAssembly] Use ToolChain reference instead of getToolChain().

Diff Detail

Event Timeline

fcambus created this revision.Oct 14 2021, 2:48 AM
Herald added subscribers: ecnelises, sunfish, jgravelle-google, dschuff. · View Herald TranscriptOct 14 2021, 2:48 AM
fcambus requested review of this revision.Oct 14 2021, 2:48 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 14 2021, 2:48 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B128809: Diff 379641.Oct 14 2021, 3:13 AM
sbc100 accepted this revision.Oct 14 2021, 5:57 AM
This revision is now accepted and ready to land.Oct 14 2021, 5:57 AM
This revision was landed with ongoing or failed builds.Oct 14 2021, 10:45 AM
Closed by commit rGf7a3214306cb: [Driver][WebAssembly] Use ToolChain reference instead of getToolChain(). (authored by fcambus). · Explain Why
This revision was automatically updated to reflect the committed changes.
fcambus added a commit: rGf7a3214306cb: [Driver][WebAssembly] Use ToolChain reference instead of getToolChain()..

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
4 lines

Diff 379767

clang/lib/Driver/ToolChains/WebAssembly.cpp

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Linesvoid wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
const ArgList &Args, const ArgList &Args,
const char *LinkingOutput) const { const char *LinkingOutput) const {
const ToolChain &ToolChain = getToolChain(); const ToolChain &ToolChain = getToolChain();
const char *Linker = Args.MakeArgString(getLinkerPath(Args)); const char *Linker = Args.MakeArgString(getLinkerPath(Args));
ArgStringList CmdArgs; ArgStringList CmdArgs;
CmdArgs.push_back("-m"); CmdArgs.push_back("-m");
if (getToolChain().getTriple().isArch64Bit()) if (ToolChain.getTriple().isArch64Bit())
CmdArgs.push_back("wasm64"); CmdArgs.push_back("wasm64");
else else
CmdArgs.push_back("wasm32"); CmdArgs.push_back("wasm32");
if (Args.hasArg(options::OPT_s)) if (Args.hasArg(options::OPT_s))
CmdArgs.push_back("--strip-all"); CmdArgs.push_back("--strip-all");
Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_L);
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Linesvoid wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
C.addCommand(std::make_unique<Command>(JA, *this, C.addCommand(std::make_unique<Command>(JA, *this,
ResponseFileSupport::AtFileCurCP(), ResponseFileSupport::AtFileCurCP(),
Linker, CmdArgs, Inputs, Output)); Linker, CmdArgs, Inputs, Output));
// When optimizing, if wasm-opt is available, run it. // 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)) {
auto WasmOptPath = getToolChain().GetProgramPath("wasm-opt"); auto WasmOptPath = ToolChain.GetProgramPath("wasm-opt");
if (WasmOptPath != "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))
▲ Show 20 Lines • Show All 314 Lines • Show Last 20 Lines