mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
allocate before calling T::default in <Arc<T>>::default()
Same rationale as in the previous commit.
This commit is contained in:
parent
dd0620b867
commit
5e474f7d83
@ -104,6 +104,7 @@
|
||||
#![feature(async_closure)]
|
||||
#![feature(async_fn_traits)]
|
||||
#![feature(async_iterator)]
|
||||
#![feature(box_uninit_write)]
|
||||
#![feature(clone_to_uninit)]
|
||||
#![feature(coerce_unsized)]
|
||||
#![feature(const_align_of_val)]
|
||||
|
@ -3447,7 +3447,13 @@ impl<T: Default> Default for Arc<T> {
|
||||
/// assert_eq!(*x, 0);
|
||||
/// ```
|
||||
fn default() -> Arc<T> {
|
||||
Arc::new(Default::default())
|
||||
let x = Box::into_raw(Box::write(Box::new_uninit(), ArcInner {
|
||||
strong: atomic::AtomicUsize::new(1),
|
||||
weak: atomic::AtomicUsize::new(1),
|
||||
data: T::default(),
|
||||
}));
|
||||
// SAFETY: `Box::into_raw` consumes the `Box` and never returns null
|
||||
unsafe { Self::from_inner(NonNull::new_unchecked(x)) }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -19,9 +19,9 @@ pub fn box_default_inplace() -> Box<(String, String)> {
|
||||
// CHECK-LABEL: @arc_default_inplace
|
||||
#[no_mangle]
|
||||
pub fn arc_default_inplace() -> Arc<(String, String)> {
|
||||
// CHECK: [[ALLOCA:%.*]] = alloca
|
||||
// CHECK-NOT: alloca
|
||||
// CHECK: [[ARC:%.*]] = {{.*}}call {{.*}}__rust_alloc(
|
||||
// CHECK: call void @llvm.memcpy
|
||||
// CHECK-NOT: call void @llvm.memcpy
|
||||
// CHECK: ret ptr [[ARC]]
|
||||
Arc::default()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user