forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#125834 - workingjubilee:weaken-thir-unsafeck-for-addr-of-static-mut, r=compiler-errors treat `&raw (const|mut) UNSAFE_STATIC` implied deref as safe Fixes rust-lang#125833 As reported in that and related issues, `static mut STATIC_MUT: T` is very often used in embedded code, and is in many ways equivalent to `static STATIC_CELL: SyncUnsafeCell<T>`. The Rust expression of `&raw mut STATIC_MUT` and `SyncUnsafeCell::get(&STATIC_CELL)` are approximately equal, and both evaluate to `*mut T`. The library function is safe because it has *declared itself* to be safe. However, the raw ref operator is unsafe because all uses of `static mut` are considered unsafe, even though the static's value is not used by this expression (unlike, for example, `&STATIC_MUT`). We can fix this unnatural difference by simply adding the proper exclusion for the safety check inside the THIR unsafeck, so that we do not declare it unsafe if it is not. While the primary concern here is `static mut`, this change is made for all instances of an "unsafe static", which includes a static declared inside `extern "abi" {}`. Hypothetically, we could go as far as generalizing this to all instances of `&raw (const|mut) *ptr`, but today we do not, as we have not actually considered the range of possible expressions that use a similar encoding. We do not even extend this to thread-local equivalents, because they have less clear semantics.
- Loading branch information
Showing
13 changed files
with
133 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
//@ check-pass | ||
#![feature(const_mut_refs)] | ||
use std::ptr; | ||
|
||
// This code should remain unsafe because of the two unsafe operations here, | ||
// even if in a hypothetical future we deem all &raw (const|mut) *ptr exprs safe. | ||
|
||
static mut BYTE: u8 = 0; | ||
static mut BYTE_PTR: *mut u8 = ptr::addr_of_mut!(BYTE); | ||
// An unsafe static's ident is a place expression in its own right, so despite the above being safe | ||
// (it's fine to create raw refs to places!) the following derefs the ptr before creating its ref | ||
static mut DEREF_BYTE_PTR: *mut u8 = unsafe { ptr::addr_of_mut!(*BYTE_PTR) }; | ||
|
||
fn main() { | ||
let _ = unsafe { DEREF_BYTE_PTR }; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#![feature(const_mut_refs)] | ||
|
||
use std::ptr; | ||
|
||
// This code should remain unsafe because of the two unsafe operations here, | ||
// even if in a hypothetical future we deem all &raw (const|mut) *ptr exprs safe. | ||
|
||
static mut BYTE: u8 = 0; | ||
static mut BYTE_PTR: *mut u8 = ptr::addr_of_mut!(BYTE); | ||
// An unsafe static's ident is a place expression in its own right, so despite the above being safe | ||
// (it's fine to create raw refs to places!) the following derefs the ptr before creating its ref! | ||
static mut DEREF_BYTE_PTR: *mut u8 = ptr::addr_of_mut!(*BYTE_PTR); | ||
//~^ ERROR: use of mutable static | ||
//~| ERROR: dereference of raw pointer | ||
|
||
fn main() { | ||
let _ = unsafe { DEREF_BYTE_PTR }; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block | ||
--> $DIR/raw-ref-deref-without-unsafe.rs:12:56 | ||
| | ||
LL | static mut DEREF_BYTE_PTR: *mut u8 = ptr::addr_of_mut!(*BYTE_PTR); | ||
| ^^^^^^^^^ dereference of raw pointer | ||
| | ||
= note: raw pointers may be null, dangling or unaligned; they can violate aliasing rules and cause data races: all of these are undefined behavior | ||
|
||
error[E0133]: use of mutable static is unsafe and requires unsafe function or block | ||
--> $DIR/raw-ref-deref-without-unsafe.rs:12:57 | ||
| | ||
LL | static mut DEREF_BYTE_PTR: *mut u8 = ptr::addr_of_mut!(*BYTE_PTR); | ||
| ^^^^^^^^ use of mutable static | ||
| | ||
= note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior | ||
|
||
error: aborting due to 2 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0133`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
//@ check-pass | ||
#![feature(raw_ref_op)] | ||
use std::ptr; | ||
|
||
// see https://github.com/rust-lang/rust/issues/125833 | ||
// notionally, taking the address of an extern static is a safe operation, | ||
// as we only point at it instead of generating a true reference to it | ||
|
||
// it may potentially induce linker errors, but the safety of that is not about taking addresses! | ||
// any safety obligation of the extern static's correctness in declaration is on the extern itself, | ||
// see RFC 3484 for more on that: https://rust-lang.github.io/rfcs/3484-unsafe-extern-blocks.html | ||
|
||
extern "C" { | ||
static THERE: u8; | ||
static mut SOMEWHERE: u8; | ||
} | ||
|
||
fn main() { | ||
let ptr2there = ptr::addr_of!(THERE); | ||
let ptr2somewhere = ptr::addr_of!(SOMEWHERE); | ||
let ptr2somewhere = ptr::addr_of_mut!(SOMEWHERE); | ||
|
||
// testing both addr_of and the expression it directly expands to | ||
let raw2there = &raw const THERE; | ||
let raw2somewhere = &raw const SOMEWHERE; | ||
let raw2somewhere = &raw mut SOMEWHERE; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
//@ check-pass | ||
#![feature(raw_ref_op)] | ||
use std::ptr; | ||
|
||
// see https://github.com/rust-lang/rust/issues/125833 | ||
// notionally, taking the address of a static mut is a safe operation, | ||
// as we only point at it instead of generating a true reference to it | ||
static mut NOWHERE: usize = 0; | ||
|
||
fn main() { | ||
let p2nowhere = ptr::addr_of!(NOWHERE); | ||
let p2nowhere = ptr::addr_of_mut!(NOWHERE); | ||
|
||
// testing both addr_of and the expression it directly expands to | ||
let raw2nowhere = &raw const NOWHERE; | ||
let raw2nowhere = &raw mut NOWHERE; | ||
} |