Skip to content

Commit 5c04441

Browse files
tests: Update and bless cmse-nonsecure ABI tests
1 parent c6498f3 commit 5c04441

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

tests/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
fn main() {
44
let non_secure_function = unsafe {
55
core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
6-
//~^ ERROR [E0658]
6+
//~^ ERROR [E0570]
7+
//~| ERROR [E0658]
78
0x10000004,
89
)
910
};
Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
error[E0570]: `"C-cmse-nonsecure-call"` is not a supported ABI for the current target
2+
--> $DIR/gate_test.rs:5:46
3+
|
4+
LL | core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
5+
| ^^^^^^^^^^^^^^^^^^^^^^^
6+
17
error[E0658]: the extern "C-cmse-nonsecure-call" ABI is experimental and subject to change
28
--> $DIR/gate_test.rs:5:46
39
|
@@ -8,16 +14,7 @@ LL | core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32
814
= help: add `#![feature(abi_c_cmse_nonsecure_call)]` to the crate attributes to enable
915
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1016

11-
error: aborting due to 1 previous error
12-
13-
For more information about this error, try `rustc --explain E0658`.
14-
Future incompatibility report: Future breakage diagnostic:
15-
warning: the calling convention "C-cmse-nonsecure-call" is not supported on this target
16-
--> $DIR/gate_test.rs:5:39
17-
|
18-
LL | core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
19-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
20-
|
21-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
22-
= note: for more information, see issue #130260 <https://github.com/rust-lang/rust/issues/130260>
17+
error: aborting due to 2 previous errors
2318

19+
Some errors have detailed explanations: E0570, E0658.
20+
For more information about an error, try `rustc --explain E0570`.

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
2+
--> $DIR/gate_test.rs:4:12
3+
|
4+
LL | pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
6+
17
error[E0658]: the extern "C-cmse-nonsecure-entry" ABI is experimental and subject to change
28
--> $DIR/gate_test.rs:4:12
39
|
@@ -8,12 +14,6 @@ LL | pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
814
= help: add `#![feature(cmse_nonsecure_entry)]` to the crate attributes to enable
915
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1016

11-
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
12-
--> $DIR/gate_test.rs:4:1
13-
|
14-
LL | pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
15-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
16-
1717
error: aborting due to 2 previous errors
1818

1919
Some errors have detailed explanations: E0570, E0658.

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.aarch64.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
2-
--> $DIR/trustzone-only.rs:17:1
2+
--> $DIR/trustzone-only.rs:17:12
33
|
44
LL | pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to 1 previous error
88

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.thumb7.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
2-
--> $DIR/trustzone-only.rs:17:1
2+
--> $DIR/trustzone-only.rs:17:12
33
|
44
LL | pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to 1 previous error
88

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.x86.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0570]: `"C-cmse-nonsecure-entry"` is not a supported ABI for the current target
2-
--> $DIR/trustzone-only.rs:17:1
2+
--> $DIR/trustzone-only.rs:17:12
33
|
44
LL | pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to 1 previous error
88

0 commit comments

Comments
 (0)