Skip to content

msvc: support lots of flags #2832

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

Merged
sylvestre merged 1 commit into from
Sep 3, 2026
Merged

msvc: support lots of flags #2832

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
165 changes: 165 additions & 0 deletions src/compiler/msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_take_arg!("Fo", PathBuf, Concatenated, Output),
msvc_take_arg!("Fp", PathBuf, Concatenated, TooHardPath), // allows users to specify the name for a PCH (when using /Yu or /Yc), PCHs are not supported in sccache.
msvc_take_arg!("Fr", PathBuf, Concatenated, TooHardPath),
msvc_take_arg!("Ft", PathBuf, Concatenated, TooHardPath), // #import include paths - not yet supported.
msvc_flag!("Fx", TooHardFlag),
msvc_flag!("GA", PassThrough),
msvc_flag!("GF", PassThrough),
Expand All @@ -329,6 +330,7 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_flag!("GS-", PassThrough),
msvc_flag!("GT", PassThrough),
msvc_flag!("GX", PassThrough),
msvc_flag!("GX-", PassThrough),
msvc_flag!("GZ", PassThrough),
msvc_flag!("Gd", PassThrough),
msvc_flag!("Ge", PassThrough),
Expand All @@ -337,6 +339,8 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_flag!("Gm-", PassThrough), // disable minimal rebuild; we prefer no minimal rebuild, so marking it as disabled is fine
msvc_flag!("Gr", PassThrough),
msvc_take_arg!("Gs", OsString, Concatenated, PassThroughWithSuffix),
msvc_flag!("Gu", PassThrough),
msvc_flag!("Gu-", PassThrough),
msvc_flag!("Gv", PassThrough),
msvc_flag!("Gw", PassThrough),
msvc_flag!("Gw-", PassThrough),
Expand All @@ -351,6 +355,7 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_flag!("JMC-", PassThrough),
msvc_flag!("LD", PassThrough),
msvc_flag!("LDd", PassThrough),
msvc_flag!("LN", PassThrough),
msvc_flag!("MD", PassThrough),
msvc_flag!("MDd", PassThrough),
msvc_take_arg!("MP", OsString, Concatenated, IgnoreWithSuffix),
Expand All @@ -372,14 +377,19 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_flag!("Oy", PassThrough),
msvc_flag!("Oy-", PassThrough),
msvc_flag!("P", SuppressCompilation),
msvc_flag!("PD", PassThrough),
msvc_flag!("PH", PassThrough),
msvc_flag!("QIfist", PassThrough),
msvc_flag!("QIntel-jcc-erratum", PassThrough),
msvc_flag!("Qfast_transcendentals", PassThrough),
msvc_flag!("Qimprecise_fwaits", PassThrough),
msvc_flag!("Qpar", PassThrough),
msvc_flag!("Qpar-", PassThrough),
msvc_flag!("Qpar-report:1", PassThrough),
msvc_flag!("Qpar-report:2", PassThrough),
msvc_flag!("Qsafe_fp_loads", PassThrough),
msvc_flag!("Qspectre", PassThrough),
msvc_flag!("Qspectre-", PassThrough),
msvc_flag!("Qspectre-load", PassThrough),
msvc_flag!("Qspectre-load-cf", PassThrough),
msvc_flag!("Qvec-report:1", PassThrough),
Expand Down Expand Up @@ -443,10 +453,14 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_take_arg!("deps", PathBuf, Concatenated, DepFile),
msvc_take_arg!("diagnostics:", OsString, Concatenated, PassThroughWithSuffix),
msvc_take_arg!("doc", PathBuf, Concatenated, TooHardPath), // Creates an .xdc file.
msvc_flag!("dynamicdeopt", TooHardFlag), // Dynamic deoptimization is not supported.
msvc_take_arg!("dynamicdeopt:suffix", OsString, Separated, TooHard), // Dynamic deoptimization is not supported.
msvc_flag!("dynamicdeopt:sync", TooHardFlag), // Dynamic deoptimization is not supported.
msvc_take_arg!("errorReport:", OsString, Concatenated, PassThroughWithSuffix), // Deprecated.
msvc_take_arg!("execution-charset:", OsString, Concatenated, PassThroughWithSuffix),
msvc_flag!("experimental:deterministic", PassThrough),
msvc_flag!("experimental:external", PassThrough),
msvc_take_arg!("experimental:log", PathBuf, Concatenated, TooHardPath), // SARIF logging is not supported.
msvc_flag!("experimental:module", TooHardFlag),
msvc_flag!("experimental:module-", PassThrough), // Explicitly disabled modules.
msvc_take_arg!("experimental:preprocessor", OsString, Concatenated, PassThroughWithSuffix),
Expand All @@ -457,13 +471,18 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_flag!("external:W3", PassThrough),
msvc_flag!("external:W4", PassThrough),
msvc_flag!("external:anglebrackets", PassThrough),
msvc_flag!("external:templates-", PassThrough),
msvc_flag!("fastfail", PassThrough),
msvc_take_arg!("favor:", OsString, Concatenated, PassThroughWithSuffix),
msvc_flag!("forceInterlockedFunctions", PassThrough),
msvc_flag!("forceInterlockedFunctions-", PassThrough),
msvc_take_arg!("fp:", OsString, Concatenated, PassThroughWithSuffix),
msvc_take_arg!("fpcvt:", OsString, Concatenated, PassThroughWithSuffix),
msvc_take_arg!("fsanitize-blacklist", PathBuf, Concatenated(b'='), ExtraHashFile),
msvc_flag!("fsanitize=address", PassThrough),
msvc_flag!("fsyntax-only", SuppressCompilation),
msvc_take_arg!("guard:cf", OsString, Concatenated, PassThroughWithSuffix),
msvc_take_arg!("guard:ehcont", OsString, Concatenated, PassThroughWithSuffix),
msvc_flag!("homeparams", PassThrough),
msvc_flag!("hotpatch", PassThrough),
// New: C++20 msvc modules flags.
Expand All @@ -476,15 +495,18 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_take_arg!("imsvc", PathBuf, CanBeSeparated, PreprocessorArgumentPath),
msvc_flag!("interface", TooHardFlag),
msvc_flag!("internalPartition", TooHardFlag),
msvc_flag!("jumptablerdata", PassThrough),
msvc_flag!("kernel", PassThrough),
msvc_flag!("kernel-", PassThrough),
msvc_flag!("nologo", PassThrough),
msvc_take_arg!("o", PathBuf, Separated, Output), // Deprecated but valid
msvc_flag!("openmp", PassThrough),
msvc_flag!("openmp-", PassThrough),
msvc_flag!("openmp:experimental", PassThrough),
msvc_flag!("options:strict", PassThrough),
msvc_flag!("permissive", PassThrough),
msvc_flag!("permissive-", PassThrough),
msvc_flag!("presetPadding", PassThrough),
msvc_take_arg!("reference", OsString, Separated, TooHard),
msvc_flag!("sdl", PassThrough),
msvc_flag!("sdl-", PassThrough),
Expand All @@ -500,13 +522,17 @@ msvc_args!(static ARGS: [ArgInfo<ArgData>; _] = [
msvc_flag!("vd0", PassThrough),
msvc_flag!("vd1", PassThrough),
msvc_flag!("vd2", PassThrough),
msvc_flag!("vlen", PassThrough),
msvc_take_arg!("vlen=", OsString, Concatenated, PassThroughWithSuffix),
msvc_flag!("vmb", PassThrough),
msvc_flag!("vmg", PassThrough),
msvc_flag!("vmm", PassThrough),
msvc_flag!("vms", PassThrough),
msvc_flag!("vmv", PassThrough),
msvc_flag!("volatile:iso", PassThrough),
msvc_flag!("volatile:ms", PassThrough),
msvc_flag!("volatileMetadata", PassThrough),
msvc_flag!("volatileMetadata-", PassThrough),
msvc_flag!("w", PassThrough),
msvc_take_arg!("w1", OsString, Concatenated, PassThroughWithSuffix),
msvc_take_arg!("w2", OsString, Concatenated, PassThroughWithSuffix),
Expand Down Expand Up @@ -2345,6 +2371,145 @@ mod test {
);
}

#[test]
fn test_parse_arguments_passthrough_additional() {
let args = ovec![
"-GX-",
"-Gu",
"-Gu-",
"-LN",
"-PD",
"-PH",
"-Qpar-report:1",
"-Qpar-report:2",
"-Qspectre-",
"-external:templates-",
"-forceInterlockedFunctions",
"-forceInterlockedFunctions-",
"-fpcvt:IA",
"/fpcvt:BC",
"-guard:ehcont",
"/guard:ehcont-",
"-jumptablerdata",
"-options:strict",
"-presetPadding",
"-vlen",
"-vlen=256",
"-volatileMetadata",
"-volatileMetadata-",
"-c",
"-Fofoo.obj",
"foo.c"
];
let ParsedArguments {
input,
common_args,
dependency_args,
preprocessor_args,
..
} = match parse_arguments(args) {
CompilerArguments::Ok(args) => args,
o => panic!("Got unexpected parse result: {:?}", o),
};
assert_eq!(Some("foo.c"), input.to_str());
assert!(preprocessor_args.is_empty());
assert!(dependency_args.is_empty());
assert_eq!(
common_args,
ovec!(
"-GX-",
"-Gu",
"-Gu-",
"-LN",
"-PD",
"-PH",
"-Qpar-report:1",
"-Qpar-report:2",
"-Qspectre-",
"-external:templates-",
"-forceInterlockedFunctions",
"-forceInterlockedFunctions-",
"-fpcvt:IA",
"/fpcvt:BC",
"-guard:ehcont",
"/guard:ehcont-",
"-jumptablerdata",
"-options:strict",
"-presetPadding",
"-vlen",
"-vlen=256",
"-volatileMetadata",
"-volatileMetadata-"
)
);
}

#[test]
fn test_parse_arguments_dynamicdeopt() {
assert_eq!(
CompilerArguments::CannotCache("-dynamicdeopt", None),
parse_arguments(ovec!["-c", "foo.c", "-Fofoo.obj", "-dynamicdeopt"])
);
}

#[test]
fn test_parse_arguments_dynamicdeopt_suffix() {
assert_eq!(
CompilerArguments::CannotCache("-dynamicdeopt:suffix", None),
parse_arguments(ovec![
"-c",
"foo.c",
"-Fofoo.obj",
"-dynamicdeopt:suffix",
"foo"
])
);
}

#[test]
fn test_parse_arguments_dynamicdeopt_sync() {
assert_eq!(
CompilerArguments::CannotCache("-dynamicdeopt:sync", None),
parse_arguments(ovec!["-c", "foo.c", "-Fofoo.obj", "-dynamicdeopt:sync"])
);
}

#[test]
fn test_parse_arguments_experimental_log_file() {
assert_eq!(
CompilerArguments::CannotCache("-experimental:log", None),
parse_arguments(ovec![
"-c",
"foo.c",
"-Fofoo.obj",
"-experimental:log",
"foo"
])
);
}

#[test]
fn test_parse_arguments_experimental_log_directory() {
assert_eq!(
CompilerArguments::CannotCache("-experimental:log", None),
parse_arguments(ovec![
"-c",
"foo.c",
"-Fofoo.obj",
"-experimental:log",
"foo\\"
])
);
}

#[test]
fn test_parse_arguments_ft() {
assert_eq!(
CompilerArguments::CannotCache("-Ft", None),
parse_arguments(ovec!["-c", "foo.c", "-Fofoo.obj", "-Ft/hello/world"])
);
}

#[test]
fn test_parse_arguments_too_many_inputs_single() {
assert_eq!(
Expand Down
Loading