OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not drop_in_place elements of Vec<T> if T doesn't need dropping

Browse Source 
With -O2, LLVM's inliner can remove this code, but this does not happen
with -O1 and lower. As a result, dropping Vec<u8> was linear with length,
resulting in abysmal performance for large buffers.
This commit is contained in:
whitequark 2015-09-20 11:04:01 +03:00
parent fd38a75077
commit c5fa7776df
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcollections/vec.rs
View File

@ -65,7 +65,7 @@ use alloc::heap::EMPTY;
use core::cmp::Ordering;
use core::fmt;
use core::hash::{self, Hash};
use core::intrinsics::{arith_offset, assume, drop_in_place};
use core::intrinsics::{arith_offset, assume, drop_in_place, needs_drop};
use core::iter::FromIterator;
use core::mem;
use core::ops::{Index, IndexMut, Deref};
@ -1322,8 +1322,10 @@ impl<T> Drop for Vec<T> {
// OK because exactly when this stops being a valid assumption, we
// don't need unsafe_no_drop_flag shenanigans anymore.
if self.buf.unsafe_no_drop_flag_needs_drop() {
for x in self.iter_mut() {
unsafe { drop_in_place(x); }
if unsafe { needs_drop::<T>() } {
for x in self.iter_mut() {
unsafe { drop_in_place(x); }
}
}
}
// RawVec handles deallocation