Skip to content

Commit 867e776

Browse files
committed
Also cover the new extern "C-cmse-nonsecure-entry" in tests
1 parent 47293c1 commit 867e776

7 files changed

+286
-149
lines changed
+49-28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: use of calling convention not supported on this target on function pointer
2-
--> $DIR/unsupported.rs:34:15
2+
--> $DIR/unsupported.rs:35:15
33
|
44
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -9,13 +9,13 @@ LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
99
= note: `#[warn(unsupported_fn_ptr_calling_conventions)]` on by default
1010

1111
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
12-
--> $DIR/unsupported.rs:39:1
12+
--> $DIR/unsupported.rs:40:1
1313
|
1414
LL | extern "ptx-kernel" {}
1515
| ^^^^^^^^^^^^^^^^^^^^^^
1616

1717
warning: use of calling convention not supported on this target on function pointer
18-
--> $DIR/unsupported.rs:48:17
18+
--> $DIR/unsupported.rs:49:17
1919
|
2020
LL | fn aapcs_ptr(f: extern "aapcs" fn()) {
2121
| ^^^^^^^^^^^^^^^^^^^
@@ -24,13 +24,13 @@ LL | fn aapcs_ptr(f: extern "aapcs" fn()) {
2424
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
2525

2626
error[E0570]: `"aapcs"` is not a supported ABI for the current target
27-
--> $DIR/unsupported.rs:61:1
27+
--> $DIR/unsupported.rs:62:1
2828
|
2929
LL | extern "aapcs" {}
3030
| ^^^^^^^^^^^^^^^^^
3131

3232
warning: use of calling convention not supported on this target on function pointer
33-
--> $DIR/unsupported.rs:70:18
33+
--> $DIR/unsupported.rs:71:18
3434
|
3535
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
3636
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -39,13 +39,13 @@ LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
3939
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
4040

4141
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
42-
--> $DIR/unsupported.rs:75:1
42+
--> $DIR/unsupported.rs:76:1
4343
|
4444
LL | extern "msp430-interrupt" {}
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4646

4747
warning: use of calling convention not supported on this target on function pointer
48-
--> $DIR/unsupported.rs:80:15
48+
--> $DIR/unsupported.rs:81:15
4949
|
5050
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
5151
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -54,13 +54,13 @@ LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
5454
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
5555

5656
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
57-
--> $DIR/unsupported.rs:85:1
57+
--> $DIR/unsupported.rs:86:1
5858
|
5959
LL | extern "avr-interrupt" {}
6060
| ^^^^^^^^^^^^^^^^^^^^^^^^^
6161

6262
warning: use of calling convention not supported on this target on function pointer
63-
--> $DIR/unsupported.rs:93:17
63+
--> $DIR/unsupported.rs:94:17
6464
|
6565
LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
6666
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -69,13 +69,13 @@ LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
6969
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
7070

7171
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
72-
--> $DIR/unsupported.rs:104:1
72+
--> $DIR/unsupported.rs:105:1
7373
|
7474
LL | extern "riscv-interrupt-m" {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7676

7777
warning: use of calling convention not supported on this target on function pointer
78-
--> $DIR/unsupported.rs:115:15
78+
--> $DIR/unsupported.rs:116:15
7979
|
8080
LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
8181
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -84,13 +84,13 @@ LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
8484
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
8585

8686
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
87-
--> $DIR/unsupported.rs:126:1
87+
--> $DIR/unsupported.rs:127:1
8888
|
8989
LL | extern "x86-interrupt" {}
9090
| ^^^^^^^^^^^^^^^^^^^^^^^^^
9191

9292
warning: use of calling convention not supported on this target on function pointer
93-
--> $DIR/unsupported.rs:138:20
93+
--> $DIR/unsupported.rs:139:20
9494
|
9595
LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
9696
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -99,13 +99,13 @@ LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
9999
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
100100

101101
error[E0570]: `"thiscall"` is not a supported ABI for the current target
102-
--> $DIR/unsupported.rs:151:1
102+
--> $DIR/unsupported.rs:152:1
103103
|
104104
LL | extern "thiscall" {}
105105
| ^^^^^^^^^^^^^^^^^^^^
106106

107107
warning: use of calling convention not supported on this target on function pointer
108-
--> $DIR/unsupported.rs:169:19
108+
--> $DIR/unsupported.rs:170:19
109109
|
110110
LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
111111
| ^^^^^^^^^^^^^^^^^^^^^
@@ -114,7 +114,7 @@ LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
114114
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
115115

116116
warning: use of calling convention not supported on this target
117-
--> $DIR/unsupported.rs:182:1
117+
--> $DIR/unsupported.rs:183:1
118118
|
119119
LL | extern "stdcall" {}
120120
| ^^^^^^^^^^^^^^^^^^^
@@ -124,65 +124,86 @@ LL | extern "stdcall" {}
124124
= note: `#[warn(unsupported_calling_conventions)]` on by default
125125

126126
warning: use of calling convention not supported on this target on function pointer
127-
--> $DIR/unsupported.rs:194:16
127+
--> $DIR/unsupported.rs:195:21
128128
|
129-
LL | fn cmse_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
130-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
129+
LL | fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
130+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
131131
|
132132
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
133133
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
134134

135+
warning: use of calling convention not supported on this target on function pointer
136+
--> $DIR/unsupported.rs:203:22
137+
|
138+
LL | fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
139+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
140+
|
141+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
142+
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
143+
144+
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
145+
--> $DIR/unsupported.rs:208:1
146+
|
147+
LL | extern "C-cmse-nonsecure-entry" {}
148+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
149+
135150
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
136-
--> $DIR/unsupported.rs:32:1
151+
--> $DIR/unsupported.rs:33:1
137152
|
138153
LL | extern "ptx-kernel" fn ptx() {}
139154
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
140155

141156
error[E0570]: `"aapcs"` is not a supported ABI for the current target
142-
--> $DIR/unsupported.rs:42:1
157+
--> $DIR/unsupported.rs:43:1
143158
|
144159
LL | extern "aapcs" fn aapcs() {}
145160
| ^^^^^^^^^^^^^^^^^^^^^^^^^
146161

147162
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
148-
--> $DIR/unsupported.rs:68:1
163+
--> $DIR/unsupported.rs:69:1
149164
|
150165
LL | extern "msp430-interrupt" fn msp430() {}
151166
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
152167

153168
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
154-
--> $DIR/unsupported.rs:78:1
169+
--> $DIR/unsupported.rs:79:1
155170
|
156171
LL | extern "avr-interrupt" fn avr() {}
157172
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
158173

159174
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
160-
--> $DIR/unsupported.rs:88:1
175+
--> $DIR/unsupported.rs:89:1
161176
|
162177
LL | extern "riscv-interrupt-m" fn riscv() {}
163178
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
164179

165180
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
166-
--> $DIR/unsupported.rs:110:1
181+
--> $DIR/unsupported.rs:111:1
167182
|
168183
LL | extern "x86-interrupt" fn x86() {}
169184
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
170185

171186
error[E0570]: `"thiscall"` is not a supported ABI for the current target
172-
--> $DIR/unsupported.rs:132:1
187+
--> $DIR/unsupported.rs:133:1
173188
|
174189
LL | extern "thiscall" fn thiscall() {}
175190
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
176191

177192
warning: use of calling convention not supported on this target
178-
--> $DIR/unsupported.rs:158:1
193+
--> $DIR/unsupported.rs:159:1
179194
|
180195
LL | extern "stdcall" fn stdcall() {}
181196
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
182197
|
183198
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
184199
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
185200

186-
error: aborting due to 14 previous errors; 11 warnings emitted
201+
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
202+
--> $DIR/unsupported.rs:201:1
203+
|
204+
LL | extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
205+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
206+
207+
error: aborting due to 16 previous errors; 12 warnings emitted
187208

188209
For more information about this error, try `rustc --explain E0570`.

0 commit comments

Comments
 (0)