Skip to content

Commit

Permalink
Use drop_in_place in array::IntoIter::drop
Browse files Browse the repository at this point in the history
This skips the loop when the element type is known not to have drop glue, even in debug mode.
  • Loading branch information
SimonSapin committed Nov 18, 2019
1 parent a0d40f8 commit 74b5714
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions src/libcore/array/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,18 @@ where
mem::transmute::<&[MaybeUninit<T>], &[T]>(slice)
}
}

/// Returns a mutable slice of all elements that have not been yielded yet.
fn as_mut_slice(&mut self) -> &mut [T] {
// This transmute is safe, same as in `as_slice` above.
let slice = &mut self.data[self.alive.clone()];
// SAFETY: This transmute is safe. As mentioned in `new`, `MaybeUninit` retains
// the size and alignment of `T`. Furthermore, we know that all
// elements within `alive` are properly initialized.
unsafe {
mem::transmute::<&mut [MaybeUninit<T>], &mut [T]>(slice)
}
}
}


Expand Down Expand Up @@ -184,10 +196,12 @@ where
[T; N]: LengthAtMost32,
{
fn drop(&mut self) {
// We simply drop each element via `for_each`. This should not incur
// any significant runtime overhead and avoids adding another `unsafe`
// block.
self.by_ref().for_each(drop);
// SAFETY: This is safe: `as_mut_slice` returns exactly the sub-slice
// of elements that have not been moved out yet and that remain
// to be dropped.
unsafe {
ptr::drop_in_place(self.as_mut_slice())
}
}
}

Expand Down

0 comments on commit 74b5714

Please sign in to comment.