bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

vec: move some code inside alloc_or_realloc

Browse source
This commit is contained in:
Daniel Micay 2014-05-09 23:56:28 -04:00
parent f8e92cbbe3
commit 0621ccac62
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstd/vec.rs
View file

@ -403,11 +403,11 @@ impl<T> Container for Vec<T> {
// FIXME: #13996: need a way to mark the return value as `noalias` // FIXME: #13996: need a way to mark the return value as `noalias`
#[inline(never)] #[inline(never)]
unsafe fn alloc_or_realloc(ptr: *mut u8, size: uint, align: uint, old_size: uint) -> *mut u8 { unsafe fn alloc_or_realloc<T>(ptr: *mut T, size: uint, old_size: uint) -> *mut T {
if old_size == 0 { if old_size == 0 {
allocate(size, align) allocate(size, min_align_of::<T>()) as *mut T
} else { } else {
reallocate(ptr, size, align, old_size) reallocate(ptr as *mut u8, size, min_align_of::<T>(), old_size) as *mut T
} }
} }
@ -491,8 +491,7 @@ impl<T> Vec<T> {
if capacity > self.cap { if capacity > self.cap {
let size = capacity.checked_mul(&size_of::<T>()).expect("capacity overflow"); let size = capacity.checked_mul(&size_of::<T>()).expect("capacity overflow");
unsafe { unsafe {
self.ptr = alloc_or_realloc(self.ptr as *mut u8, size, min_align_of::<T>(), self.ptr = alloc_or_realloc(self.ptr, size, self.cap * size_of::<T>());
self.cap * size_of::<T>()) as *mut T;
} }
self.cap = capacity; self.cap = capacity;
} }
@ -573,8 +572,7 @@ impl<T> Vec<T> {
let size = max(old_size, 2 * size_of::<T>()) * 2; let size = max(old_size, 2 * size_of::<T>()) * 2;
if old_size > size { fail!("capacity overflow") } if old_size > size { fail!("capacity overflow") }
unsafe { unsafe {
self.ptr = alloc_or_realloc(self.ptr as *mut u8, size, min_align_of::<T>(), self.ptr = alloc_or_realloc(self.ptr, size, self.cap * size_of::<T>());
self.cap * size_of::<T>()) as *mut u8 as *mut T;
} }
self.cap = max(self.cap, 2) * 2; self.cap = max(self.cap, 2) * 2;
} }