miri: fixup for allowing &raw UNSAFE_STATIC

rust-lang · Jul 22, 2024 · b3cd9b5 · b3cd9b5
1 parent bf454af
commit b3cd9b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/tools/miri/tests/fail/extern_static.rs b/src/tools/miri/tests/fail/extern_static.rs
@@ -5,5 +5,5 @@ extern "C" {
 }
 
 fn main() {
- let _val = unsafe { std::ptr::addr_of!(FOO) }; //~ ERROR: is not supported by Miri
+ let _val = std::ptr::addr_of!(FOO); //~ ERROR: is not supported by Miri
 }
diff --git a/src/tools/miri/tests/fail/extern_static.stderr b/src/tools/miri/tests/fail/extern_static.stderr
@@ -1,8 +1,8 @@
 error: unsupported operation: extern static `FOO` is not supported by Miri
  --> $DIR/extern_static.rs:LL:CC
  |
-LL | let _val = unsafe { std::ptr::addr_of!(FOO) };
- |  ^^^ extern static `FOO` is not supported by Miri
+LL | let _val = std::ptr::addr_of!(FOO);
+ | ^^^ extern static `FOO` is not supported by Miri
  |
  = help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
  = note: BACKTRACE:

diff --git a/src/tools/miri/tests/pass/static_mut.rs b/src/tools/miri/tests/pass/static_mut.rs
@@ -2,7 +2,7 @@ use std::ptr::addr_of;
 
 static mut FOO: i32 = 42;
 
-static BAR: Foo = Foo(unsafe { addr_of!(FOO) });
+static BAR: Foo = Foo(addr_of!(FOO));
 
 #[allow(dead_code)]
 struct Foo(*const i32);