Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use pointer offset instead of deref for A/Rc::into_raw #67339

Merged
merged 2 commits into from
Jan 16, 2020
Merged

Use pointer offset instead of deref for A/Rc::into_raw #67339

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c842f02
Use pointer offset instead of deref for A/Rc::into_raw
CAD97 Dec 15, 2019
eb77f7e
Add internal safety docs to (A)Rc::into_raw
CAD97 Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/liballoc/rc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,9 +571,14 @@ impl<T: ?Sized> Rc<T> {
/// ```
#[stable(feature = "rc_raw", since = "1.17.0")]
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;
CAD97 marked this conversation as resolved.
Show resolved Hide resolved
mem::forget(this);
CAD97 marked this conversation as resolved.
Show resolved Hide resolved
ptr

unsafe {
CAD97 marked this conversation as resolved.
Show resolved Hide resolved
let offset = data_offset(&(*ptr).value);
set_data_ptr(fake_ptr, (ptr as *mut u8).offset(offset))
}
}

/// Constructs an `Rc` from a raw pointer.
Expand Down
9 changes: 7 additions & 2 deletions src/liballoc/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,14 @@ impl<T: ?Sized> Arc<T> {
/// ```
#[stable(feature = "rc_raw", since = "1.17.0")]
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);
ptr

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.
Expand Down