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

fix allocator tests

Browse source
This commit is contained in:
Ralf Jung 2020-03-04 09:50:26 +01:00
parent ad1f0f6e65
commit db0d03229c
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/compile-fail/deallocate-bad-alignment.rs
View file

@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout};
fn main() {
unsafe {
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
Global.dealloc(x, Layout::from_size_align_unchecked(1, 2));
}
}

2
tests/compile-fail/deallocate-bad-size.rs
View file

@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout};
fn main() {
unsafe {
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
Global.dealloc(x, Layout::from_size_align_unchecked(2, 1));
}
}

2
tests/compile-fail/deallocate-twice.rs
View file

@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout};
fn main() {
unsafe {
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
Global.dealloc(x, Layout::from_size_align_unchecked(1, 1));
Global.dealloc(x, Layout::from_size_align_unchecked(1, 1));
}

2
tests/compile-fail/reallocate-bad-size.rs
View file

@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout};
fn main() {
unsafe {
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
Global.realloc(x, Layout::from_size_align_unchecked(2, 1), 1).unwrap();
}
}

2
tests/compile-fail/reallocate-change-alloc.rs
View file

@ -7,7 +7,7 @@ use std::alloc::{AllocRef, Layout};
fn main() {
unsafe {
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1).unwrap();
let _z = *(x.as_ptr() as *mut u8); //~ ERROR dangling pointer was dereferenced
}

2
tests/compile-fail/reallocate-dangling.rs
View file

@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout};
fn main() {
unsafe {
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
Global.dealloc(x, Layout::from_size_align_unchecked(1, 1));
Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1).unwrap();
}

14
tests/run-pass/heap_allocator.rs
View file

@ -9,28 +9,28 @@ fn check_alloc<T: AllocRef>(mut allocator: T) { unsafe {
let layout = Layout::from_size_align(20, align).unwrap();
for _ in 0..32 {
let a = allocator.alloc(layout).unwrap();
let a = allocator.alloc(layout).unwrap().0;
assert_eq!(a.as_ptr() as usize % align, 0, "pointer is incorrectly aligned");
allocator.dealloc(a, layout);
}
let p1 = allocator.alloc_zeroed(layout).unwrap();
let p1 = allocator.alloc_zeroed(layout).unwrap().0;
assert_eq!(p1.as_ptr() as usize % align, 0, "pointer is incorrectly aligned");
let p2 = allocator.realloc(p1, layout, 40).unwrap();
let p2 = allocator.realloc(p1, layout, 40).unwrap().0;
let layout = Layout::from_size_align(40, align).unwrap();
assert_eq!(p2.as_ptr() as usize % align, 0, "pointer is incorrectly aligned");
let slice = slice::from_raw_parts(p2.as_ptr(), 20);
assert_eq!(&slice, &[0_u8; 20]);
// old size == new size
let p3 = allocator.realloc(p2, layout, 40).unwrap();
let p3 = allocator.realloc(p2, layout, 40).unwrap().0;
assert_eq!(p3.as_ptr() as usize % align, 0, "pointer is incorrectly aligned");
let slice = slice::from_raw_parts(p3.as_ptr(), 20);
assert_eq!(&slice, &[0_u8; 20]);
// old size > new size
let p4 = allocator.realloc(p3, layout, 10).unwrap();
let p4 = allocator.realloc(p3, layout, 10).unwrap().0;
let layout = Layout::from_size_align(10, align).unwrap();
assert_eq!(p4.as_ptr() as usize % align, 0, "pointer is incorrectly aligned");
let slice = slice::from_raw_parts(p4.as_ptr(), 10);
@ -46,7 +46,7 @@ fn check_align_requests<T: AllocRef>(mut allocator: T) {
let iterations = 32;
unsafe {
let pointers: Vec<_> = (0..iterations).map(|_| {
allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap()
allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap().0
}).collect();
for &ptr in &pointers {
assert_eq!((ptr.as_ptr() as usize) % align, 0,
@ -67,7 +67,7 @@ fn global_to_box() {
let l = Layout::new::<T>();
// allocate manually with global allocator, then turn into Box and free there
unsafe {
let ptr = Global.alloc(l).unwrap().as_ptr() as *mut T;
let ptr = Global.alloc(l).unwrap().0.as_ptr() as *mut T;
let b = Box::from_raw(ptr);
drop(b);
}