Skip to content

Commit e03a684

Browse files
akyrtziakyrtzi
authored
Merge pull request #5094 from akyrtzi/pr/stable-picks-driver-ignore-module-validation-flags
[Driver] Ignore the clang modules validation-related flags if clang modules are not enabled
2 parents 1d62585 + 25591a8 commit e03a684

File tree

2 files changed

+57
-36
lines changed

2 files changed

+57
-36
lines changed

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3690,38 +3690,49 @@ static void RenderModulesOptions(Compilation &C, const Driver &D,
36903690
Args.AddLastArg(CmdArgs, options::OPT_fmodules_prune_interval);
36913691
Args.AddLastArg(CmdArgs, options::OPT_fmodules_prune_after);
36923692

3693-
Args.AddLastArg(CmdArgs, options::OPT_fbuild_session_timestamp);
3693+
if (HaveClangModules) {
3694+
Args.AddLastArg(CmdArgs, options::OPT_fbuild_session_timestamp);
36943695

3695-
if (Arg *A = Args.getLastArg(options::OPT_fbuild_session_file)) {
3696-
if (Args.hasArg(options::OPT_fbuild_session_timestamp))
3697-
D.Diag(diag::err_drv_argument_not_allowed_with)
3698-
<< A->getAsString(Args) << "-fbuild-session-timestamp";
3696+
if (Arg *A = Args.getLastArg(options::OPT_fbuild_session_file)) {
3697+
if (Args.hasArg(options::OPT_fbuild_session_timestamp))
3698+
D.Diag(diag::err_drv_argument_not_allowed_with)
3699+
<< A->getAsString(Args) << "-fbuild-session-timestamp";
36993700

3700-
llvm::sys::fs::file_status Status;
3701-
if (llvm::sys::fs::status(A->getValue(), Status))
3702-
D.Diag(diag::err_drv_no_such_file) << A->getValue();
3703-
CmdArgs.push_back(Args.MakeArgString(
3704-
"-fbuild-session-timestamp=" +
3705-
Twine((uint64_t)std::chrono::duration_cast<std::chrono::seconds>(
3706-
Status.getLastModificationTime().time_since_epoch())
3707-
.count())));
3708-
}
3701+
llvm::sys::fs::file_status Status;
3702+
if (llvm::sys::fs::status(A->getValue(), Status))
3703+
D.Diag(diag::err_drv_no_such_file) << A->getValue();
3704+
CmdArgs.push_back(Args.MakeArgString(
3705+
"-fbuild-session-timestamp=" +
3706+
Twine((uint64_t)std::chrono::duration_cast<std::chrono::seconds>(
3707+
Status.getLastModificationTime().time_since_epoch())
3708+
.count())));
3709+
}
37093710

3710-
if (Args.getLastArg(options::OPT_fmodules_validate_once_per_build_session)) {
3711-
if (!Args.getLastArg(options::OPT_fbuild_session_timestamp,
3712-
options::OPT_fbuild_session_file))
3713-
D.Diag(diag::err_drv_modules_validate_once_requires_timestamp);
3711+
if (Args.getLastArg(
3712+
options::OPT_fmodules_validate_once_per_build_session)) {
3713+
if (!Args.getLastArg(options::OPT_fbuild_session_timestamp,
3714+
options::OPT_fbuild_session_file))
3715+
D.Diag(diag::err_drv_modules_validate_once_requires_timestamp);
37143716

3715-
Args.AddLastArg(CmdArgs,
3716-
options::OPT_fmodules_validate_once_per_build_session);
3717-
}
3717+
Args.AddLastArg(CmdArgs,
3718+
options::OPT_fmodules_validate_once_per_build_session);
3719+
}
37183720

3719-
if (Args.hasFlag(options::OPT_fmodules_validate_system_headers,
3720-
options::OPT_fno_modules_validate_system_headers,
3721-
ImplicitModules))
3722-
CmdArgs.push_back("-fmodules-validate-system-headers");
3721+
if (Args.hasFlag(options::OPT_fmodules_validate_system_headers,
3722+
options::OPT_fno_modules_validate_system_headers,
3723+
ImplicitModules))
3724+
CmdArgs.push_back("-fmodules-validate-system-headers");
37233725

3724-
Args.AddLastArg(CmdArgs, options::OPT_fmodules_disable_diagnostic_validation);
3726+
Args.AddLastArg(CmdArgs,
3727+
options::OPT_fmodules_disable_diagnostic_validation);
3728+
} else {
3729+
Args.ClaimAllArgs(options::OPT_fbuild_session_timestamp);
3730+
Args.ClaimAllArgs(options::OPT_fbuild_session_file);
3731+
Args.ClaimAllArgs(options::OPT_fmodules_validate_once_per_build_session);
3732+
Args.ClaimAllArgs(options::OPT_fmodules_validate_system_headers);
3733+
Args.ClaimAllArgs(options::OPT_fno_modules_validate_system_headers);
3734+
Args.ClaimAllArgs(options::OPT_fmodules_disable_diagnostic_validation);
3735+
}
37253736
}
37263737

37273738
static void RenderCharacterOptions(const ArgList &Args, const llvm::Triple &T,

‎clang/test/Driver/modules.m

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
// RUN: %clang -fmodules -fno-modules -fmodules -### %s 2>&1 | FileCheck -check-prefix=CHECK-HAS-MODULES %s
55
// CHECK-HAS-MODULES: -fmodules
66

7-
// RUN: %clang -fbuild-session-file=doesntexist -### %s 2>&1 | FileCheck -check-prefix=NOFILE %s
7+
// RUN: %clang -fmodules -fbuild-session-file=doesntexist -### %s 2>&1 | FileCheck -check-prefix=NOFILE %s
88
// NOFILE: no such file or directory: 'doesntexist'
99

1010
// RUN: touch -m -a -t 201008011501 %t.build-session-file
11-
// RUN: %clang -fbuild-session-file=%t.build-session-file -### %s 2>&1 | FileCheck -check-prefix=TIMESTAMP_ONLY %s
11+
// RUN: %clang -fmodules -fbuild-session-file=%t.build-session-file -### %s 2>&1 | FileCheck -check-prefix=TIMESTAMP_ONLY %s
1212

13-
// RUN: %clang -fbuild-session-timestamp=1280703457 -### %s 2>&1 | FileCheck -check-prefix=TIMESTAMP_ONLY %s
13+
// RUN: %clang -fmodules -fbuild-session-timestamp=1280703457 -### %s 2>&1 | FileCheck -check-prefix=TIMESTAMP_ONLY %s
1414
// TIMESTAMP_ONLY: -fbuild-session-timestamp=128{{([[:digit:]]{7})[^[:digit:]]}}
1515

16-
// RUN: %clang -fbuild-session-file=%t.build-session-file -fbuild-session-timestamp=123 -### %s 2>&1 | FileCheck -check-prefix=CONFLICT %s
16+
// RUN: %clang -fmodules -fbuild-session-file=%t.build-session-file -fbuild-session-timestamp=123 -### %s 2>&1 | FileCheck -check-prefix=CONFLICT %s
1717
// CONFLICT: error: invalid argument '-fbuild-session-file={{.*}}.build-session-file' not allowed with '-fbuild-session-timestamp'
1818

19-
// RUN: %clang -fbuild-session-timestamp=123 -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_ONCE %s
19+
// RUN: %clang -fmodules -fbuild-session-timestamp=123 -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_ONCE %s
2020
// MODULES_VALIDATE_ONCE: -fbuild-session-timestamp=123
2121
// MODULES_VALIDATE_ONCE: -fmodules-validate-once-per-build-session
2222

23-
// RUN: %clang -fbuild-session-file=%t.build-session-file -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_ONCE_FILE %s
23+
// RUN: %clang -fmodules -fbuild-session-file=%t.build-session-file -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_ONCE_FILE %s
2424
// MODULES_VALIDATE_ONCE_FILE: -fbuild-session-timestamp=128{{([[:digit:]]{7})[^[:digit:]]}}
2525
// MODULES_VALIDATE_ONCE_FILE: -fmodules-validate-once-per-build-session
2626

27-
// RUN: %clang -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_ONCE_ERR %s
27+
// RUN: %clang -fmodules -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_ONCE_ERR %s
2828
// MODULES_VALIDATE_ONCE_ERR: option '-fmodules-validate-once-per-build-session' requires '-fbuild-session-timestamp=<seconds since Epoch>' or '-fbuild-session-file=<file>'
2929

3030
// RUN: %clang -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_SYSTEM_HEADERS_DEFAULT %s
@@ -33,16 +33,16 @@
3333
// RUN: %clang -fmodules -fsyntax-only -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_SYSTEM_HEADERS_DEFAULT_MOD %s
3434
// MODULES_VALIDATE_SYSTEM_HEADERS_DEFAULT_MOD: -fmodules-validate-system-headers
3535

36-
// RUN: %clang -fmodules-validate-system-headers -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_SYSTEM_HEADERS %s
36+
// RUN: %clang -fmodules -fmodules-validate-system-headers -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_SYSTEM_HEADERS %s
3737
// MODULES_VALIDATE_SYSTEM_HEADERS: -fmodules-validate-system-headers
3838

39-
// RUN: %clang -fno-modules-validate-system-headers -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_SYSTEM_HEADERS_NOSYSVALID %s
39+
// RUN: %clang -fmodules -fno-modules-validate-system-headers -### %s 2>&1 | FileCheck -check-prefix=MODULES_VALIDATE_SYSTEM_HEADERS_NOSYSVALID %s
4040
// MODULES_VALIDATE_SYSTEM_HEADERS_NOSYSVALID-NOT: -fmodules-validate-system-headers
4141

4242
// RUN: %clang -### %s 2>&1 | FileCheck -check-prefix=MODULES_DISABLE_DIAGNOSTIC_VALIDATION_DEFAULT %s
4343
// MODULES_DISABLE_DIAGNOSTIC_VALIDATION_DEFAULT-NOT: -fmodules-disable-diagnostic-validation
4444

45-
// RUN: %clang -fmodules-disable-diagnostic-validation -### %s 2>&1 | FileCheck -check-prefix=MODULES_DISABLE_DIAGNOSTIC_VALIDATION %s
45+
// RUN: %clang -fmodules -fmodules-disable-diagnostic-validation -### %s 2>&1 | FileCheck -check-prefix=MODULES_DISABLE_DIAGNOSTIC_VALIDATION %s
4646
// MODULES_DISABLE_DIAGNOSTIC_VALIDATION: -fmodules-disable-diagnostic-validation
4747

4848
// RUN: %clang -fmodules -### %s 2>&1 | FileCheck -check-prefix=MODULES_PREBUILT_PATH_DEFAULT %s
@@ -70,3 +70,13 @@
7070
// CHECK-NO-MODULE-FILES-NOT: "-fmodules"
7171
// CHECK-NO-MODULE-FILES-NOT: "-fmodule-file=foo.pcm"
7272
// CHECK-NO-MODULE-FILES-NOT: "-fmodule-file=bar.pcm"
73+
74+
// RUN: %clang -fno-modules -fbuild-session-file=%t.build-session-file -### %s 2>&1 | FileCheck -check-prefix=SESSION_FLAG %s
75+
// RUN: %clang -fno-modules -fbuild-session-timestamp=123 -### %s 2>&1 | FileCheck -check-prefix=SESSION_FLAG %s
76+
// SESSION_FLAG-NOT: -fbuild-session-timestamp
77+
78+
// RUN: %clang -fno-modules -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=VALIDATE_ONCE_FLAG %s
79+
// VALIDATE_ONCE_FLAG-NOT: -fmodules-validate-once-per-build-session
80+
81+
// RUN: %clang -fno-modules -fmodules-validate-system-headers -### %s 2>&1 | FileCheck -check-prefix=VALIDATE_SYSTEM_FLAG %s
82+
// VALIDATE_SYSTEM_FLAG-NOT: -fmodules-validate-system-headers

0 commit comments

Comments
 (0)