user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #17475 : pnkfelix/rust/fix-17303, r=huonw

Browse source 
Add deallocate calls to the realloc-16687.rs test.

Fix #17303.
This commit is contained in:
bors 2014-09-29 21:12:16 +00:00
commit 0c66796525
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/test/run-pass/realloc-16687.rs
View file

@ -56,6 +56,13 @@ unsafe fn test_triangle() -> bool {
ret
}
unsafe fn deallocate(ptr: *mut u8, size: uint, align: uint) {
if PRINT { println!("deallocate(ptr=0x{:010x} size={:u} align={:u})",
ptr as uint, size, align);
}
heap::deallocate(ptr, size, align);
}
unsafe fn reallocate(ptr: *mut u8, size: uint, align: uint,
old_size: uint) -> *mut u8 {
if PRINT {
@ -95,10 +102,16 @@ unsafe fn test_triangle() -> bool {
}
sanity_check(ascend.as_slice());
test_1(ascend);
test_2(ascend);
test_3(ascend);
test_4(ascend);
test_1(ascend); // triangle -> square
test_2(ascend); // square -> triangle
test_3(ascend); // triangle -> square
test_4(ascend); // square -> triangle
for i in range(0u, COUNT / 2) {
let size = idx_to_size(i);
deallocate(ascend[2*i], size, ALIGN);
deallocate(ascend[2*i+1], size, ALIGN);
}
return true;