Skip to content

Commit

Permalink
Auto merge of #78446 - RalfJung:box, r=Amanieu
Browse files Browse the repository at this point in the history
fix Box::into_unique

#77187 broke Stacked Borrows pointer tagging around `Box::into_unique` (this is caused by `Box` being a special case in the type system, which box-internal code needs to account for). This PR fixes that.

r? `@Amanieu` Cc `@TimDiekmann`

Fixes #78419.
  • Loading branch information
bors committed Oct 29, 2020
2 parents ae9731c + ab374dc commit a53fb30
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions library/alloc/src/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -724,15 +724,10 @@ impl<T: ?Sized, A: AllocRef> Box<T, A> {
// Box is recognized as a "unique pointer" by Stacked Borrows, but internally it is a
// raw pointer for the type system. Turning it directly into a raw pointer would not be
// recognized as "releasing" the unique pointer to permit aliased raw accesses,
// so all raw pointer methods have to leak the box. Turning *that* to a raw pointer
// so all raw pointer methods have to go through `Box::leak`. Turning *that* to a raw pointer
// behaves correctly.
let b = mem::ManuallyDrop::new(b);

// The box is unitiliazed later when moving out the allocator. The pointer is stored
// beforehand.
let ptr = b.0;
let alloc = unsafe { ptr::read(&b.1) };
(ptr, alloc)
(Unique::from(Box::leak(b)), alloc)
}

/// Returns a reference to the underlying allocator.
Expand Down

0 comments on commit a53fb30

Please sign in to comment.