Skip to content

[clang-cl] Accept cl-style output arguments (/Fo, -Fo) for --precompile #121046

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

Closed
wants to merge 6 commits into from
Closed

[clang-cl] Accept cl-style output arguments (/Fo, -Fo) for --precompile #121046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6c2b9b
Accept /Fo and -Fo in `-fmodule-output` when running under CL mode
sharadhr Feb 7, 2025
59dcf4d
Add a test for the -fmodule-output BMI output file
sharadhr Feb 8, 2025
d2e56db
SLASH_Fo and SLASH_Fo_COLON are aliases
sharadhr May 15, 2025
8c2edef
Remove `-fmodule-output` from test
sharadhr May 15, 2025
f139bf1
Formatting fixes
sharadhr May 16, 2025
2f7aad6
Add `--` in test
sharadhr May 16, 2025
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
20 changes: 19 additions & 1 deletion clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6204,10 +6204,28 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
}

llvm::PrettyStackTraceString CrashInfo("Computing output path");

// Output to a user requested destination?
if (AtTopLevel && !isa<DsymutilJobAction>(JA) && !isa<VerifyJobAction>(JA)) {
if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o))
bool IsCLNonPCH =
IsCLMode() && !C.getArgs().hasArg(options::OPT__SLASH_Yc) &&
(isa<PreprocessJobAction>(JA) || isa<PrecompileJobAction>(JA));
bool HasAnyOutputArg =
C.getArgs().hasArg(options::OPT_o, options::OPT__SLASH_Fo);

Arg *FinalOutput = nullptr;
if (IsCLNonPCH && HasAnyOutputArg) {
FinalOutput =
C.getArgs().getLastArg(options::OPT_o, options::OPT__SLASH_Fo);
} else if (IsCLNonPCH) {
FinalOutput = C.getArgs().getLastArg(options::OPT__SLASH_Fo);
} else {
FinalOutput = C.getArgs().getLastArg(options::OPT_o);
}

if (FinalOutput) {
return C.addResultFile(FinalOutput->getValue(), &JA);
}
}

// For /P, preprocess to file named after BaseInput.
Expand Down
8 changes: 8 additions & 0 deletions clang/test/Driver/cl-cxx20-modules.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@

//--- test.pcm
// CPP20WARNING-NOT: clang-cl: warning: argument unused during compilation: '/std:c++20' [-Wunused-command-line-argument]

// test whether the following outputs %Hello.bmi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// test whether the following outputs %Hello.bmi
// test whether the following outputs %t/Hello.bmi

// RUN: %clang_cl /std:c++20 --precompile -x c++-module -Fo:"%t/Hello.bmi" -c -- %t/Hello.cppm -### 2>&1 | FileCheck %s
// CHECK: "-emit-module-interface"
// CHECK: "-o" "{{.*}}Hello.bmi"

//--- Hello.cppm
export module Hello;
Loading