Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[clang][driver] Support -x for all languages in CL mode (#89772)

Browse source 
After https://github.com/llvm/llvm-project/pull/68921, clang-cl gained
option `-x` but only for CUDA/HIP. This commit simply removes the
restriction on parameters to `-x`. Especially, it is able to use `-x
c++-module` and `-x c++-system-header` to build C++20 modules and header
units with clang-cl.

This effectively reverts commit
fe082124fa.

Closes https://github.com/llvm/llvm-project/issues/88006.
This commit is contained in:
huangqinjin 2024-05-24 13:39:17 +08:00 committed by GitHub
parent 3c9641e7f0
commit 06b5a7c205
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clang/lib/Driver/Driver.cpp
View file

@ -2653,22 +2653,13 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
Diag(clang::diag::note_drv_t_option_is_global);
}
// CUDA/HIP and their preprocessor expansions can be accepted by CL mode.
// Warn -x after last input file has no effect
auto LastXArg = Args.getLastArgValue(options::OPT_x);
const llvm::StringSet<> ValidXArgs = {"cuda", "hip", "cui", "hipi"};
if (!IsCLMode() || ValidXArgs.contains(LastXArg)) {
{
Arg *LastXArg = Args.getLastArgNoClaim(options::OPT_x);
Arg *LastInputArg = Args.getLastArgNoClaim(options::OPT_INPUT);
if (LastXArg && LastInputArg &&
LastInputArg->getIndex() < LastXArg->getIndex())
Diag(clang::diag::warn_drv_unused_x) << LastXArg->getValue();
} else {
// In CL mode suggest /TC or /TP since -x doesn't make sense if passed via
// /clang:.
if (auto *A = Args.getLastArg(options::OPT_x))
Diag(diag::err_drv_unsupported_opt_with_suggestion)
<< A->getAsString(Args) << "/TC' or '/TP";
}
for (Arg *A : Args) {

4
clang/test/Driver/x-args.c
View file

@ -6,6 +6,4 @@
// RUN: %clang -fsyntax-only %s -xc %s -xc++ -fsyntax-only 2>&1 | FileCheck %s
// CHECK: '-x c++' after last input file has no effect
// RUN: not %clang_cl /WX /clang:-xc /clang:-E /clang:-dM -- %s 2>&1 | FileCheck --implicit-check-not="error:" -check-prefix=CL %s
// RUN: not %clang_cl /TC /WX /clang:-xc /clang:-E /clang:-dM -- %s 2>&1 | FileCheck --implicit-check-not="error:" -check-prefix=CL %s
// CL: error: unsupported option '-x c'; did you mean '/TC' or '/TP'?
// RUN: %clang_cl -fsyntax-only /WX -xc++ -- %s