Skip to content

nvcc: accept the --diag-error/--diag-suppress/--diag-warn family #2816

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 2 commits into from
Aug 26, 2026
+38 −0
Merged

nvcc: accept the --diag-error/--diag-suppress/--diag-warn family #2816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9f007c
nvcc: accept the --diag-error/--diag-suppress/--diag-warn family
Kataglyphis Aug 19, 2026
9acb9e7
Merge branch 'main' into fix/nvcc-diag-suppress-separated
Kataglyphis Aug 23, 2026
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
38 changes: 38 additions & 0 deletions src/compiler/nvcc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,9 @@ counted_array!(pub static ARGS: [ArgInfo<gcc::ArgData>; _] = [
take_arg!("--dependency-output", PathBuf, Separated, DepArgumentPath),
flag!("--device-c", DoCompilation),
flag!("--device-w", DoCompilation),
take_arg!("--diag-error", OsString, CanBeSeparated(b'='), PassThrough),
take_arg!("--diag-suppress", OsString, CanBeSeparated(b'='), PassThrough),
take_arg!("--diag-warn", OsString, CanBeSeparated(b'='), PassThrough),
flag!("--expt-extended-lambda", PreprocessorArgumentFlag),
flag!("--expt-relaxed-constexpr", PreprocessorArgumentFlag),
flag!("--extended-lambda", PreprocessorArgumentFlag),
Expand Down Expand Up @@ -1461,6 +1464,9 @@ counted_array!(pub static ARGS: [ArgInfo<gcc::ArgData>; _] = [
flag!("-cubin", DoCompilation),
flag!("-dc", DoCompilation),
take_arg!("-default-stream", OsString, CanBeSeparated(b'='), PassThrough),
take_arg!("-diag-error", OsString, CanBeSeparated(b'='), PassThrough),
take_arg!("-diag-suppress", OsString, CanBeSeparated(b'='), PassThrough),
take_arg!("-diag-warn", OsString, CanBeSeparated(b'='), PassThrough),
flag!("-dw", DoCompilation),
flag!("-expt-extended-lambda", PreprocessorArgumentFlag),
flag!("-expt-relaxed-constexpr", PreprocessorArgumentFlag),
Expand Down Expand Up @@ -2155,6 +2161,38 @@ mod test {
);
}

#[test]
fn test_parse_diag_suppress_separated() {
// The separated form (`--diag-suppress 1394,1388`, as OpenCV emits
// it) must not be mistaken for a second input file.
let a = parses!(
"-x=cu",
"-Xcudafe",
"--display_error_number",
"--diag-suppress",
"1394,1388",
"-diag-warn=68",
"-c",
"foo.c",
"-o",
"foo.o"
);
assert_eq!(Some("foo.c"), a.input.to_str());
assert_eq!(Language::Cuda, a.language);
assert_eq!(
ovec![
"-Xcudafe",
"--display_error_number",
"--diag-suppress",
"1394,1388",
"-diag-warn",
"68",
"-c"
],
a.common_args
);
}

#[test]
fn test_parse_no_capturing_of_xcompiler() {
let a = parses!(
Expand Down
Loading