Skip to content

Commit cb0ac06

Browse files
committed
forgot to change tests
1 parent 2c9dd45 commit cb0ac06

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

tests/ui/pointer_in_nomem_asm_block.rs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
#![crate_type = "lib"]
33
#![no_std]
44

5+
use core::arch::asm;
6+
57
unsafe fn nomem_bad(p: &i32) {
6-
core::arch::asm!(
8+
asm!(
79
"asdf {p1}, {p2}, {p3}",
810
p1 = in(reg) p,
911
p2 = in(reg) p as *const _ as usize,
@@ -12,23 +14,16 @@ unsafe fn nomem_bad(p: &i32) {
1214
);
1315
}
1416

15-
unsafe fn readonly_bad(p: &mut i32) {
16-
core::arch::asm!("asdf {p}", p = in(reg) p, options(readonly, nostack, preserves_flags));
17-
}
18-
1917
unsafe fn nomem_good(p: &i32) {
20-
core::arch::asm!("asdf {p}", p = in(reg) p, options(readonly, nostack, preserves_flags));
18+
asm!("asdf {p}", p = in(reg) p, options(readonly, nostack, preserves_flags));
2119
let p = p as *const i32 as usize;
22-
core::arch::asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
20+
asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
2321
}
2422

25-
unsafe fn readonly_good(p: &mut i32) {
26-
core::arch::asm!("asdf {p}", p = in(reg) p, options(nostack, preserves_flags));
27-
core::arch::asm!("asdf {p}", p = in(reg) &*p, options(readonly, nostack, preserves_flags));
28-
let p = p as *const i32;
29-
core::arch::asm!("asdf {p}", p = in(reg) p, options(readonly, nostack, preserves_flags));
23+
unsafe fn nomem_bad2(p: &mut i32) {
24+
asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
3025
}
3126

32-
unsafe fn nomem_bad2(p: &mut i32) {
33-
core::arch::asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
27+
unsafe fn nomem_fn(p: extern "C" fn()) {
28+
asm!("call {p}", p = in(reg) p, options(nomem));
3429
}
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: passing pointer to nomem asm block
2-
--> tests/ui/pointer_in_nomem_asm_block.rs:8:9
2+
--> tests/ui/pointer_in_nomem_asm_block.rs:10:9
33
|
44
LL | p1 = in(reg) p,
55
| ^^^^^^^^^^^^^^
@@ -11,10 +11,16 @@ LL | p3 = in(reg) p,
1111
= help: to override `-D warnings` add `#[allow(clippy::pointer_in_nomem_asm_block)]`
1212

1313
error: passing pointer to nomem asm block
14-
--> tests/ui/pointer_in_nomem_asm_block.rs:33:34
14+
--> tests/ui/pointer_in_nomem_asm_block.rs:24:22
1515
|
16-
LL | core::arch::asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
17-
| ^^^^^^^^^^^^^
16+
LL | asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
17+
| ^^^^^^^^^^^^^
1818

19-
error: aborting due to 2 previous errors
19+
error: passing pointer to nomem asm block
20+
--> tests/ui/pointer_in_nomem_asm_block.rs:28:22
21+
|
22+
LL | asm!("call {p}", p = in(reg) p, options(nomem));
23+
| ^^^^^^^^^^^^^
24+
25+
error: aborting due to 3 previous errors
2026

0 commit comments

Comments
 (0)