mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #123967 - RalfJung:static_mut_refs, r=Nilstrieb

Browse Source 
static_mut_refs: use raw pointers to remove the remaining FIXME

Using `SyncUnsafeCell` would not make a lot of sense IMO.
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-04-20 21:45:35 +01:00 committed by GitHub
commit ccd9880769
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs
View File

@ -1,4 +1,13 @@
#![feature(no_core, lang_items, never_type, linkage, extern_types, thread_local, repr_simd)] #![feature(
no_core,
lang_items,
never_type,
linkage,
extern_types,
thread_local,
repr_simd,
raw_ref_op
)]
#![no_core] #![no_core]
#![allow(dead_code, non_camel_case_types, internal_features)] #![allow(dead_code, non_camel_case_types, internal_features)]
@ -112,9 +121,7 @@ fn start<T: Termination + 'static>(
static mut NUM: u8 = 6 * 7; static mut NUM: u8 = 6 * 7;
// FIXME: Use `SyncUnsafeCell` instead of allowing `static_mut_refs` lint static NUM_REF: &'static u8 = unsafe { &*&raw const NUM };
#[allow(static_mut_refs)]
static NUM_REF: &'static u8 = unsafe { &NUM };
unsafe fn zeroed<T>() -> T { unsafe fn zeroed<T>() -> T {
let mut uninit = MaybeUninit { uninit: () }; let mut uninit = MaybeUninit { uninit: () };

6
compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs
View File

@ -2,7 +2,7 @@
#![feature( #![feature(
no_core, unboxed_closures, start, lang_items, never_type, linkage, no_core, unboxed_closures, start, lang_items, never_type, linkage,
extern_types, thread_local extern_types, thread_local, raw_ref_op
)] )]
#![no_core] #![no_core]
#![allow(dead_code, internal_features, non_camel_case_types)] #![allow(dead_code, internal_features, non_camel_case_types)]
@ -99,9 +99,7 @@ fn start<T: Termination + 'static>(
static mut NUM: u8 = 6 * 7; static mut NUM: u8 = 6 * 7;
// FIXME: Use `SyncUnsafeCell` instead of allowing `static_mut_refs` lint static NUM_REF: &'static u8 = unsafe { &* &raw const NUM };
#[allow(static_mut_refs)]
static NUM_REF: &'static u8 = unsafe { &NUM };
macro_rules! assert { macro_rules! assert {
($e:expr) => { ($e:expr) => {

5
library/std/src/sys/thread_local/static_local.rs
View File

@ -11,8 +11,6 @@ pub macro thread_local_inner {
(@key $t:ty, const $init:expr) => {{ (@key $t:ty, const $init:expr) => {{
#[inline] // see comments below #[inline] // see comments below
#[deny(unsafe_op_in_unsafe_fn)] #[deny(unsafe_op_in_unsafe_fn)]
// FIXME: Use `SyncUnsafeCell` instead of allowing `static_mut_refs` lint
#[allow(static_mut_refs)]
unsafe fn __getit( unsafe fn __getit(
_init: $crate::option::Option<&mut $crate::option::Option<$t>>, _init: $crate::option::Option<&mut $crate::option::Option<$t>>,
) -> $crate::option::Option<&'static $t> { ) -> $crate::option::Option<&'static $t> {
@ -25,7 +23,8 @@ pub macro thread_local_inner {
// FIXME(#84224) this should come after the `target_thread_local` // FIXME(#84224) this should come after the `target_thread_local`
// block. // block.
static mut VAL: $t = INIT_EXPR; static mut VAL: $t = INIT_EXPR;
unsafe { $crate::option::Option::Some(&VAL) } // SAFETY: we only ever create shared references, so there's no mutable aliasing.
unsafe { $crate::option::Option::Some(&*$crate::ptr::addr_of!(VAL)) }
} }
unsafe { unsafe {