cmse: rephrase error message when types don't fit

folkertdev · folkertdev · commit b47de64cdbfa · 2025-10-08T16:36:18.000+02:00
diff --git a/compiler/rustc_hir_analysis/messages.ftl b/compiler/rustc_hir_analysis/messages.ftl
@@ -80,11 +80,8 @@ hir_analysis_cmse_entry_generic =
 
 hir_analysis_cmse_inputs_stack_spill =
     arguments for `{$abi}` function too large to pass via registers
-    .label = {$plural ->
-        [false] this argument doesn't
-        *[true] these arguments don't
-    } fit in the available registers
-    .note = functions with the `{$abi}` ABI must pass all their arguments via the 4 32-bit available argument registers
+    .label = does not fit in the available registers
+    .note = functions with the `{$abi}` ABI must pass all their arguments via the 4 32-bit argument registers
 
 hir_analysis_cmse_output_stack_spill =
     return value of `{$abi}` function too large to pass via registers
diff --git a/compiler/rustc_hir_analysis/src/errors.rs b/compiler/rustc_hir_analysis/src/errors.rs
@@ -1617,7 +1617,6 @@ pub(crate) struct CmseInputsStackSpill {
     #[primary_span]
     #[label]
     pub spans: Vec<Span>,
-    pub plural: bool,
     pub abi: ExternAbi,
 }
 
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/cmse.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/cmse.rs
@@ -124,8 +124,7 @@ fn is_valid_cmse_inputs<'tcx>(
     if !excess_argument_spans.is_empty() {
         // fn f(x: u32, y: u32, z: u32, w: u16, q: u16) -> u32,
         //                                      ^^^^^^
-        let plural = excess_argument_spans.len() != 1;
-        dcx.emit_err(errors::CmseInputsStackSpill { spans: excess_argument_spans, plural, abi });
+        dcx.emit_err(errors::CmseInputsStackSpill { spans: excess_argument_spans, abi });
     }
 
     Ok(())
diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.stderr
@@ -2,43 +2,43 @@ error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass v
   --> $DIR/params-via-stack.rs:16:64
    |
 LL |     f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32),
-   |                                                                ^^^     ^^^ these arguments don't fit in the available registers
+   |                                                                ^^^     ^^^ does not fit in the available registers
    |                                                                |
-   |                                                                these arguments don't fit in the available registers
+   |                                                                does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:17:61
    |
 LL |     f2: extern "cmse-nonsecure-call" fn(u32, u32, u32, u16, u16),
-   |                                                             ^^^ this argument doesn't fit in the available registers
+   |                                                             ^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:18:51
    |
 LL |     f3: extern "cmse-nonsecure-call" fn(u32, u64, u32),
-   |                                                   ^^^ this argument doesn't fit in the available registers
+   |                                                   ^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:19:56
    |
 LL |     f4: extern "cmse-nonsecure-call" fn(AlignRelevant, u32),
-   |                                                        ^^^ this argument doesn't fit in the available registers
+   |                                                        ^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:20:41
    |
 LL |     f5: extern "cmse-nonsecure-call" fn([u32; 5]),
-   |                                         ^^^^^^^^ this argument doesn't fit in the available registers
+   |                                         ^^^^^^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error: aborting due to 5 previous errors
 
diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.stderr
@@ -2,43 +2,43 @@ error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass
   --> $DIR/params-via-stack.rs:15:76
    |
 LL | pub extern "cmse-nonsecure-entry" fn f1(_: u32, _: u32, _: u32, _: u32, _: u32, _: u32) {}
-   |                                                                            ^^^     ^^^ these arguments don't fit in the available registers
+   |                                                                            ^^^     ^^^ does not fit in the available registers
    |                                                                            |
-   |                                                                            these arguments don't fit in the available registers
+   |                                                                            does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:17:76
    |
 LL | pub extern "cmse-nonsecure-entry" fn f2(_: u32, _: u32, _: u32, _: u16, _: u16) {}
-   |                                                                            ^^^ this argument doesn't fit in the available registers
+   |                                                                            ^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:19:60
    |
 LL | pub extern "cmse-nonsecure-entry" fn f3(_: u32, _: u64, _: u32) {}
-   |                                                            ^^^ this argument doesn't fit in the available registers
+   |                                                            ^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:21:62
    |
 LL | pub extern "cmse-nonsecure-entry" fn f4(_: AlignRelevant, _: u32) {}
-   |                                                              ^^^ this argument doesn't fit in the available registers
+   |                                                              ^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
   --> $DIR/params-via-stack.rs:25:44
    |
 LL | pub extern "cmse-nonsecure-entry" fn f5(_: [u32; 5]) {}
-   |                                            ^^^^^^^^ this argument doesn't fit in the available registers
+   |                                            ^^^^^^^^ does not fit in the available registers
    |
-   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
+   = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error: aborting due to 5 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -1617,7 +1617,6 @@ pub(crate) struct CmseInputsStackSpill {`
`1617`	`1617`	`#[primary_span]`
`1618`	`1618`	`#[label]`
`1619`	`1619`	`pub spans: Vec<Span>,`
`1620`		`- pub plural: bool,`
`1621`	`1620`	`pub abi: ExternAbi,`
`1622`	`1621`	`}`
`1623`	`1622`
Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,7 @@ fn is_valid_cmse_inputs<'tcx>(`
`124`	`124`	`if !excess_argument_spans.is_empty() {`
`125`	`125`	`// fn f(x: u32, y: u32, z: u32, w: u16, q: u16) -> u32,`
`126`	`126`	`// ^^^^^^`
`127`		`- let plural = excess_argument_spans.len() != 1;`
`128`		`- dcx.emit_err(errors::CmseInputsStackSpill { spans: excess_argument_spans, plural, abi });`
	`127`	`+ dcx.emit_err(errors::CmseInputsStackSpill { spans: excess_argument_spans, abi });`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`Ok(())`
Original file line number	Diff line number	Diff line change
@@ -2,43 +2,43 @@ error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass v
`2`	`2`	`--> $DIR/params-via-stack.rs:16:64`
`3`	`3`	`\|`
`4`	`4`	`LL \| f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32),`
`5`		`- \| ^^^ ^^^ these arguments don't fit in the available registers`
	`5`	`+ \| ^^^ ^^^ does not fit in the available registers`
`6`	`6`	`\| \|`
`7`		`- \| these arguments don't fit in the available registers`
	`7`	`+ \| does not fit in the available registers`
`8`	`8`	`\|`
`9`		- = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`9`	+ = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
`10`	`10`
`11`	`11`	error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
`12`	`12`	`--> $DIR/params-via-stack.rs:17:61`
`13`	`13`	`\|`
`14`	`14`	`LL \| f2: extern "cmse-nonsecure-call" fn(u32, u32, u32, u16, u16),`
`15`		`- \| ^^^ this argument doesn't fit in the available registers`
	`15`	`+ \| ^^^ does not fit in the available registers`
`16`	`16`	`\|`
`17`		- = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`17`	+ = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
`18`	`18`
`19`	`19`	error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
`20`	`20`	`--> $DIR/params-via-stack.rs:18:51`
`21`	`21`	`\|`
`22`	`22`	`LL \| f3: extern "cmse-nonsecure-call" fn(u32, u64, u32),`
`23`		`- \| ^^^ this argument doesn't fit in the available registers`
	`23`	`+ \| ^^^ does not fit in the available registers`
`24`	`24`	`\|`
`25`		- = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`25`	+ = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
`26`	`26`
`27`	`27`	error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
`28`	`28`	`--> $DIR/params-via-stack.rs:19:56`
`29`	`29`	`\|`
`30`	`30`	`LL \| f4: extern "cmse-nonsecure-call" fn(AlignRelevant, u32),`
`31`		`- \| ^^^ this argument doesn't fit in the available registers`
	`31`	`+ \| ^^^ does not fit in the available registers`
`32`	`32`	`\|`
`33`		- = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`33`	+ = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
`34`	`34`
`35`	`35`	error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
`36`	`36`	`--> $DIR/params-via-stack.rs:20:41`
`37`	`37`	`\|`
`38`	`38`	`LL \| f5: extern "cmse-nonsecure-call" fn([u32; 5]),`
`39`		`- \| ^^^^^^^^ this argument doesn't fit in the available registers`
	`39`	`+ \| ^^^^^^^^ does not fit in the available registers`
`40`	`40`	`\|`
`41`		- = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`41`	+ = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
`42`	`42`
`43`	`43`	`error: aborting due to 5 previous errors`
`44`	`44`
Original file line number	Diff line number	Diff line change
@@ -2,43 +2,43 @@ error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass
`2`	`2`	`--> $DIR/params-via-stack.rs:15:76`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub extern "cmse-nonsecure-entry" fn f1(_: u32, _: u32, _: u32, _: u32, _: u32, _: u32) {}`
`5`		`- \| ^^^ ^^^ these arguments don't fit in the available registers`
	`5`	`+ \| ^^^ ^^^ does not fit in the available registers`
`6`	`6`	`\| \|`
`7`		`- \| these arguments don't fit in the available registers`
	`7`	`+ \| does not fit in the available registers`
`8`	`8`	`\|`
`9`		- = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`9`	+ = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
`10`	`10`
`11`	`11`	error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
`12`	`12`	`--> $DIR/params-via-stack.rs:17:76`
`13`	`13`	`\|`
`14`	`14`	`LL \| pub extern "cmse-nonsecure-entry" fn f2(_: u32, _: u32, _: u32, _: u16, _: u16) {}`
`15`		`- \| ^^^ this argument doesn't fit in the available registers`
	`15`	`+ \| ^^^ does not fit in the available registers`
`16`	`16`	`\|`
`17`		- = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`17`	+ = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
`18`	`18`
`19`	`19`	error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
`20`	`20`	`--> $DIR/params-via-stack.rs:19:60`
`21`	`21`	`\|`
`22`	`22`	`LL \| pub extern "cmse-nonsecure-entry" fn f3(_: u32, _: u64, _: u32) {}`
`23`		`- \| ^^^ this argument doesn't fit in the available registers`
	`23`	`+ \| ^^^ does not fit in the available registers`
`24`	`24`	`\|`
`25`		- = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`25`	+ = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
`26`	`26`
`27`	`27`	error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
`28`	`28`	`--> $DIR/params-via-stack.rs:21:62`
`29`	`29`	`\|`
`30`	`30`	`LL \| pub extern "cmse-nonsecure-entry" fn f4(_: AlignRelevant, _: u32) {}`
`31`		`- \| ^^^ this argument doesn't fit in the available registers`
	`31`	`+ \| ^^^ does not fit in the available registers`
`32`	`32`	`\|`
`33`		- = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`33`	+ = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
`34`	`34`
`35`	`35`	error[E0798]: arguments for `"cmse-nonsecure-entry"` function too large to pass via registers
`36`	`36`	`--> $DIR/params-via-stack.rs:25:44`
`37`	`37`	`\|`
`38`	`38`	`LL \| pub extern "cmse-nonsecure-entry" fn f5(_: [u32; 5]) {}`
`39`		`- \| ^^^^^^^^ this argument doesn't fit in the available registers`
	`39`	`+ \| ^^^^^^^^ does not fit in the available registers`
`40`	`40`	`\|`
`41`		- = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit available argument registers
	`41`	+ = note: functions with the `"cmse-nonsecure-entry"` ABI must pass all their arguments via the 4 32-bit argument registers
`42`	`42`
`43`	`43`	`error: aborting due to 5 previous errors`
`44`	`44`