bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make [A]Rc::allocate_for_layout() use try_allocate_for_layout()

Browse source
This commit is contained in:
Manish Goregaokar 2020-12-31 16:36:28 +00:00
parent 589aa8e29c
commit 8f3cb7d75d
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
library/alloc/src/rc.rs
View file

@ -1107,20 +1107,10 @@ impl<T: ?Sized> Rc<T> {
// `&*(ptr as *const RcBox<T>)`, but this created a misaligned // `&*(ptr as *const RcBox<T>)`, but this created a misaligned
// reference (see #54908). // reference (see #54908).
let layout = Layout::new::<RcBox<()>>().extend(value_layout).unwrap().0.pad_to_align(); let layout = Layout::new::<RcBox<()>>().extend(value_layout).unwrap().0.pad_to_align();
// Allocate for the layout.
let ptr = allocate(layout).unwrap_or_else(|_| handle_alloc_error(layout));
// Initialize the RcBox
let inner = mem_to_rcbox(ptr.as_non_null_ptr().as_ptr());
unsafe { unsafe {
debug_assert_eq!(Layout::for_value(&*inner), layout); Rc::try_allocate_for_layout(value_layout, allocate, mem_to_rcbox)
.unwrap_or_else(|_| handle_alloc_error(layout))
ptr::write(&mut (*inner).strong, Cell::new(1));
ptr::write(&mut (*inner).weak, Cell::new(1));
} }
inner
} }
/// Allocates an `RcBox<T>` with sufficient space for /// Allocates an `RcBox<T>` with sufficient space for
@ -1129,6 +1119,7 @@ impl<T: ?Sized> Rc<T> {
/// ///
/// The function `mem_to_rcbox` is called with the data pointer /// The function `mem_to_rcbox` is called with the data pointer
/// and must return back a (potentially fat)-pointer for the `RcBox<T>`. /// and must return back a (potentially fat)-pointer for the `RcBox<T>`.
#[inline]
unsafe fn try_allocate_for_layout( unsafe fn try_allocate_for_layout(
value_layout: Layout, value_layout: Layout,
allocate: impl FnOnce(Layout) -> Result<NonNull<[u8]>, AllocError>, allocate: impl FnOnce(Layout) -> Result<NonNull<[u8]>, AllocError>,

13
library/alloc/src/sync.rs
View file

@ -1085,19 +1085,10 @@ impl<T: ?Sized> Arc<T> {
// `&*(ptr as *const ArcInner<T>)`, but this created a misaligned // `&*(ptr as *const ArcInner<T>)`, but this created a misaligned
// reference (see #54908). // reference (see #54908).
let layout = Layout::new::<ArcInner<()>>().extend(value_layout).unwrap().0.pad_to_align(); let layout = Layout::new::<ArcInner<()>>().extend(value_layout).unwrap().0.pad_to_align();
let ptr = allocate(layout).unwrap_or_else(|_| handle_alloc_error(layout));
// Initialize the ArcInner
let inner = mem_to_arcinner(ptr.as_non_null_ptr().as_ptr());
debug_assert_eq!(unsafe { Layout::for_value(&*inner) }, layout);
unsafe { unsafe {
ptr::write(&mut (*inner).strong, atomic::AtomicUsize::new(1)); Arc::try_allocate_for_layout(value_layout, allocate, mem_to_arcinner)
ptr::write(&mut (*inner).weak, atomic::AtomicUsize::new(1)); .unwrap_or_else(|_| handle_alloc_error(layout))
} }
inner
} }
/// Allocates an `ArcInner<T>` with sufficient space for /// Allocates an `ArcInner<T>` with sufficient space for