rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move sallocx and excess into not null branch

Browse Source
This commit is contained in:
gnzlbg
2017-10-25 14:46:02 +02:00
parent e1a71e7b8a
commit f39594d4bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/liballoc_jemalloc/lib.rs
View File

@@ -229,13 +229,14 @@ mod contents {
let flags = align_to_flags(new_align); let flags = align_to_flags(new_align);
let ptr = rallocx(ptr as *mut c_void, new_size, flags) as *mut u8; let ptr = rallocx(ptr as *mut c_void, new_size, flags) as *mut u8;
let alloc_size = sallocx(ptr as *mut c_void, flags);
if ptr.is_null() { if ptr.is_null() {
let layout = Layout::from_size_align_unchecked(new_size, new_align); let layout = Layout::from_size_align_unchecked(new_size, new_align);
ptr::write(err as *mut AllocErr, ptr::write(err as *mut AllocErr,
AllocErr::Exhausted { request: layout }); AllocErr::Exhausted { request: layout });
} else {
let alloc_size = sallocx(ptr as *mut c_void, flags);
*excess = alloc_size;
} }
*excess = alloc_size;
ptr ptr
} }