Auto merge of #67339 - CAD97:rc-provenance, r=sfackler
Use pointer offset instead of deref for A/Rc::into_raw Internals thread: https://internals.rust-lang.org/t/rc-and-internal-mutability/11463/2?u=cad97 The current implementation of (`A`)`Rc::into_raw` uses the `Deref::deref` implementation to get the pointer-to-data that is returned. This is problematic in the proposed Stacked Borrow rules, as this only gets shared provenance over the data location. (Note that the strong/weak counts are `UnsafeCell` (`Cell`/`Atomic`) so shared provenance can still mutate them, but the data itself is not.) When promoted back to a real reference counted pointer, the restored pointer can be used for mutation through `::get_mut` (if it is the only surviving reference). However, this mutates through a pointer ultimately derived from a `&T` borrow, violating the Stacked Borrow rules. There are three known potential solutions to this issue: - Stacked Borrows is wrong, liballoc is correct. - Fully admit (`A`)`Rc` as an "internal mutability" type and store the data payload in an `UnsafeCell` like the strong/weak counts are. (Note: this is not needed generally since the `RcBox`/`ArcInner` is stored behind a shared `NonNull` which maintains shared write provenance as a raw pointer.) - Adjust `into_raw` to do direct manipulation of the pointer (like `from_raw`) so that it maintains write provenance and doesn't derive the pointer from a reference. This PR implements the third option, as recommended by @RalfJung. Potential future work: provide `as_raw` and `clone_raw` associated functions to allow the [`&T` -> (`A`)`Rc<T>` pattern](https://internals.rust-lang.org/t/rc-and-internal-mutability/11463/2?u=cad97) to be used soundly without creating (`A`)`Rc` from references.
This commit is contained in:
commit
e02c475da5
2 changed files with 24 additions and 4 deletions
|
@ -565,9 +565,19 @@ impl<T: ?Sized> Rc<T> {
|
||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "rc_raw", since = "1.17.0")]
|
#[stable(feature = "rc_raw", since = "1.17.0")]
|
||||||
pub fn into_raw(this: Self) -> *const T {
|
pub fn into_raw(this: Self) -> *const T {
|
||||||
let ptr: *const T = &*this;
|
let ptr: *mut RcBox<T> = NonNull::as_ptr(this.ptr);
|
||||||
|
let fake_ptr = ptr as *mut T;
|
||||||
mem::forget(this);
|
mem::forget(this);
|
||||||
ptr
|
|
||||||
|
// SAFETY: This cannot go through Deref::deref.
|
||||||
|
// Instead, we manually offset the pointer rather than manifesting a reference.
|
||||||
|
// This is so that the returned pointer retains the same provenance as our pointer.
|
||||||
|
// This is required so that e.g. `get_mut` can write through the pointer
|
||||||
|
// after the Rc is recovered through `from_raw`.
|
||||||
|
unsafe {
|
||||||
|
let offset = data_offset(&(*ptr).value);
|
||||||
|
set_data_ptr(fake_ptr, (ptr as *mut u8).offset(offset))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Constructs an `Rc` from a raw pointer.
|
/// Constructs an `Rc` from a raw pointer.
|
||||||
|
|
|
@ -545,9 +545,19 @@ impl<T: ?Sized> Arc<T> {
|
||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "rc_raw", since = "1.17.0")]
|
#[stable(feature = "rc_raw", since = "1.17.0")]
|
||||||
pub fn into_raw(this: Self) -> *const T {
|
pub fn into_raw(this: Self) -> *const T {
|
||||||
let ptr: *const T = &*this;
|
let ptr: *mut ArcInner<T> = NonNull::as_ptr(this.ptr);
|
||||||
|
let fake_ptr = ptr as *mut T;
|
||||||
mem::forget(this);
|
mem::forget(this);
|
||||||
ptr
|
|
||||||
|
// SAFETY: This cannot go through Deref::deref.
|
||||||
|
// Instead, we manually offset the pointer rather than manifesting a reference.
|
||||||
|
// This is so that the returned pointer retains the same provenance as our pointer.
|
||||||
|
// This is required so that e.g. `get_mut` can write through the pointer
|
||||||
|
// after the Arc is recovered through `from_raw`.
|
||||||
|
unsafe {
|
||||||
|
let offset = data_offset(&(*ptr).data);
|
||||||
|
set_data_ptr(fake_ptr, (ptr as *mut u8).offset(offset))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Constructs an `Arc` from a raw pointer.
|
/// Constructs an `Arc` from a raw pointer.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue