Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23843 - emilio:insta-boom, r=SimonSapin

Browse source 
Don't insta-free in UniqueArc::assume_init.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23843)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-07-25 10:37:43 -04:00 • committed by GitHub
commit adefd2cdfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/servo_arc/lib.rs
View file

@ -125,6 +125,12 @@ impl<T> UniqueArc<T> {
.unwrap_or_else(|| alloc::handle_alloc_error(layout)) .unwrap_or_else(|| alloc::handle_alloc_error(layout))
.cast::<ArcInner<mem::MaybeUninit<T>>>(); .cast::<ArcInner<mem::MaybeUninit<T>>>();
ptr::write(&mut p.as_mut().count, atomic::AtomicUsize::new(1)); ptr::write(&mut p.as_mut().count, atomic::AtomicUsize::new(1));
#[cfg(feature = "gecko_refcount_logging")]
{
NS_LogCtor(p.as_ptr() as *mut _, b"ServoArc\0".as_ptr() as *const _, 8)
}
UniqueArc(Arc { UniqueArc(Arc {
p, p,
phantom: PhantomData, phantom: PhantomData,
@ -144,7 +150,7 @@ impl<T> UniqueArc<mem::MaybeUninit<T>> {
#[inline] #[inline]
pub unsafe fn assume_init(this: Self) -> UniqueArc<T> { pub unsafe fn assume_init(this: Self) -> UniqueArc<T> {
UniqueArc(Arc { UniqueArc(Arc {
p: this.0.p.cast(), p: mem::ManuallyDrop::new(this).0.p.cast(),
phantom: PhantomData, phantom: PhantomData,
}) })
} }