Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d72bf4a

Browse files
authoredNov 23, 2024
Unrolled build for rust-lang#133355
Rollup merge of rust-lang#133355 - chorman0773:spec-layout-tests, r=jieyouxu Add language tests for aggregate types This adds some tests for struct and union types, ensuring that they satisfy the rules for all structs and unions - namely that fields of structs do not overlap, fields are well-aligned, and the size of the entire. The reference annotations used are from rust-lang/reference#1654, though the rules tested here were FCPed in <rust-lang/reference#1152>.
2 parents 386a7c7 + 8578ccc commit d72bf4a

File tree

6 files changed

+265
-0
lines changed

6 files changed

+265
-0
lines changed
 
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//@ run-pass
2+
//@ reference: layout.aggregate.struct-size-align
3+
//@ edition: 2018
4+
5+
#[repr(align(64))]
6+
#[derive(Copy, Clone)]
7+
#[allow(dead_code)]
8+
pub struct Overaligned(u8);
9+
10+
#[allow(dead_code)]
11+
struct ReprRustStruct {
12+
x: i32,
13+
y: [u32; 4],
14+
z: f32,
15+
a: u128,
16+
b: Overaligned,
17+
}
18+
19+
fn test_alignment_contains_all_fields() {
20+
assert!(core::mem::align_of::<ReprRustStruct>() >= core::mem::align_of::<i32>());
21+
assert!(core::mem::align_of::<ReprRustStruct>() >= core::mem::align_of::<[u32; 4]>());
22+
assert!(core::mem::align_of::<ReprRustStruct>() >= core::mem::align_of::<f32>());
23+
assert!(core::mem::align_of::<ReprRustStruct>() >= core::mem::align_of::<u128>());
24+
assert!(core::mem::align_of::<ReprRustStruct>() >= core::mem::align_of::<Overaligned>());
25+
}
26+
27+
fn main() {
28+
test_alignment_contains_all_fields();
29+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
//@ run-pass
2+
//@ reference: layout.aggregate.struct-offsets
3+
//@ edition: 2018
4+
5+
#[repr(align(64))]
6+
#[derive(Copy, Clone)]
7+
#[allow(dead_code)]
8+
pub struct Overaligned(u8);
9+
10+
#[allow(dead_code)]
11+
struct ReprRustStruct {
12+
x: i32,
13+
y: [u32; 4],
14+
z: f32,
15+
a: u128,
16+
b: Overaligned,
17+
}
18+
19+
macro_rules! span_of {
20+
($ty:ty , $field:tt) => {{
21+
let __field = unsafe { ::core::mem::zeroed::<$ty>() };
22+
23+
(
24+
core::mem::offset_of!($ty, $field),
25+
core::mem::offset_of!($ty, $field) + core::mem::size_of_val(&__field.$field),
26+
)
27+
}};
28+
}
29+
30+
fn test_fields_make_sense(a: &(usize, usize)) {
31+
assert!(a.0 <= a.1);
32+
}
33+
34+
// order is `begin, end`
35+
fn test_non_overlapping(a: &(usize, usize), b: &(usize, usize)) {
36+
assert!((a.1 <= b.0) || (b.1 <= a.0));
37+
}
38+
39+
fn test_fields_non_overlapping() {
40+
let fields = [
41+
span_of!(ReprRustStruct, x),
42+
span_of!(ReprRustStruct, y),
43+
span_of!(ReprRustStruct, z),
44+
span_of!(ReprRustStruct, a),
45+
span_of!(ReprRustStruct, b),
46+
];
47+
48+
test_fields_make_sense(&fields[0]);
49+
test_fields_make_sense(&fields[1]);
50+
test_fields_make_sense(&fields[2]);
51+
test_fields_make_sense(&fields[3]);
52+
test_fields_make_sense(&fields[4]);
53+
54+
test_non_overlapping(&fields[0], &fields[1]);
55+
test_non_overlapping(&fields[0], &fields[2]);
56+
test_non_overlapping(&fields[0], &fields[3]);
57+
test_non_overlapping(&fields[0], &fields[4]);
58+
test_non_overlapping(&fields[1], &fields[2]);
59+
test_non_overlapping(&fields[2], &fields[3]);
60+
test_non_overlapping(&fields[2], &fields[4]);
61+
test_non_overlapping(&fields[3], &fields[4]);
62+
}
63+
64+
fn test_fields_aligned() {
65+
assert_eq!((core::mem::offset_of!(ReprRustStruct, x) % (core::mem::align_of::<i32>())), 0);
66+
assert_eq!((core::mem::offset_of!(ReprRustStruct, y) % (core::mem::align_of::<[u32; 4]>())), 0);
67+
assert_eq!((core::mem::offset_of!(ReprRustStruct, z) % (core::mem::align_of::<f32>())), 0);
68+
assert_eq!((core::mem::offset_of!(ReprRustStruct, a) % (core::mem::align_of::<u128>())), 0);
69+
assert_eq!(
70+
(core::mem::offset_of!(ReprRustStruct, b) % (core::mem::align_of::<Overaligned>())),
71+
0
72+
);
73+
}
74+
75+
fn main() {
76+
test_fields_non_overlapping();
77+
test_fields_aligned();
78+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
//@ run-pass
2+
//@ reference: layout.aggregate.struct-size-align
3+
//@ edition: 2018
4+
5+
#[allow(dead_code)]
6+
struct ReprRustStruct {
7+
x: i32,
8+
y: [u32; 4],
9+
z: f32,
10+
a: u128,
11+
}
12+
13+
fn test_size_contains_all_types() {
14+
assert!(
15+
core::mem::size_of::<ReprRustStruct>()
16+
>= (core::mem::size_of::<i32>()
17+
+ core::mem::size_of::<[u32; 4]>()
18+
+ core::mem::size_of::<f32>()
19+
+ core::mem::size_of::<u128>())
20+
);
21+
}
22+
23+
fn test_size_contains_all_fields() {
24+
assert!(
25+
(core::mem::offset_of!(ReprRustStruct, x) + core::mem::size_of::<i32>())
26+
<= core::mem::size_of::<ReprRustStruct>()
27+
);
28+
assert!(
29+
(core::mem::offset_of!(ReprRustStruct, y) + core::mem::size_of::<[u32; 4]>())
30+
<= core::mem::size_of::<ReprRustStruct>()
31+
);
32+
assert!(
33+
(core::mem::offset_of!(ReprRustStruct, z) + core::mem::size_of::<f32>())
34+
<= core::mem::size_of::<ReprRustStruct>()
35+
);
36+
assert!(
37+
(core::mem::offset_of!(ReprRustStruct, a) + core::mem::size_of::<u128>())
38+
<= core::mem::size_of::<ReprRustStruct>()
39+
);
40+
}
41+
42+
fn test_size_modulo_align() {
43+
assert_eq!(core::mem::size_of::<ReprRustStruct>() % core::mem::align_of::<ReprRustStruct>(), 0);
44+
}
45+
46+
fn main() {
47+
test_size_contains_all_fields();
48+
test_size_contains_all_types();
49+
test_size_modulo_align();
50+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//@ run-pass
2+
//@ reference: layout.aggregate.struct-size-align
3+
//@ edition: 2018
4+
5+
#[repr(align(64))]
6+
#[derive(Copy, Clone)]
7+
#[allow(dead_code)]
8+
pub struct Overaligned(u8);
9+
10+
#[allow(dead_code)]
11+
union ReprRustUnion {
12+
x: i32,
13+
y: [u32; 4],
14+
z: f32,
15+
a: u128,
16+
b: Overaligned,
17+
}
18+
19+
fn test_alignment_contains_all_fields() {
20+
assert!(core::mem::align_of::<ReprRustUnion>() >= core::mem::align_of::<i32>());
21+
assert!(core::mem::align_of::<ReprRustUnion>() >= core::mem::align_of::<[u32; 4]>());
22+
assert!(core::mem::align_of::<ReprRustUnion>() >= core::mem::align_of::<f32>());
23+
assert!(core::mem::align_of::<ReprRustUnion>() >= core::mem::align_of::<u128>());
24+
assert!(core::mem::align_of::<ReprRustUnion>() >= core::mem::align_of::<Overaligned>());
25+
}
26+
27+
fn main() {
28+
test_alignment_contains_all_fields();
29+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//@ run-pass
2+
//@ reference: layout.aggregate.struct-offsets
3+
//@ edition: 2018
4+
5+
#[repr(align(64))]
6+
#[derive(Copy, Clone)]
7+
#[allow(dead_code)]
8+
pub struct Overaligned(u8);
9+
10+
#[allow(dead_code)]
11+
union ReprRustUnion {
12+
x: i32,
13+
y: [u32; 4],
14+
z: f32,
15+
a: u128,
16+
b: Overaligned,
17+
}
18+
19+
fn test_fields_aligned() {
20+
assert_eq!((core::mem::offset_of!(ReprRustUnion, x) % (core::mem::align_of::<i32>())), 0);
21+
assert_eq!((core::mem::offset_of!(ReprRustUnion, y) % (core::mem::align_of::<[u32; 4]>())), 0);
22+
assert_eq!((core::mem::offset_of!(ReprRustUnion, z) % (core::mem::align_of::<f32>())), 0);
23+
assert_eq!((core::mem::offset_of!(ReprRustUnion, a) % (core::mem::align_of::<u128>())), 0);
24+
assert_eq!(
25+
(core::mem::offset_of!(ReprRustUnion, b) % (core::mem::align_of::<Overaligned>())),
26+
0
27+
);
28+
}
29+
30+
fn main() {
31+
test_fields_aligned();
32+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
//@ run-pass
2+
//@ reference: layout.aggregate.struct-size-align
3+
//@ edition: 2018
4+
5+
#[allow(dead_code)]
6+
union ReprRustUnion {
7+
x: i32,
8+
y: [u32; 4],
9+
z: f32,
10+
a: u128,
11+
}
12+
13+
fn test_size_contains_each_type() {
14+
assert!(core::mem::size_of::<i32>() <= core::mem::size_of::<ReprRustUnion>());
15+
assert!(core::mem::size_of::<[u32; 4]>() <= core::mem::size_of::<ReprRustUnion>());
16+
assert!(core::mem::size_of::<f32>() <= core::mem::size_of::<ReprRustUnion>());
17+
assert!(core::mem::size_of::<u128>() <= core::mem::size_of::<ReprRustUnion>());
18+
}
19+
20+
fn test_size_contains_all_fields() {
21+
assert!(
22+
(core::mem::offset_of!(ReprRustUnion, x) + core::mem::size_of::<i32>())
23+
<= core::mem::size_of::<ReprRustUnion>()
24+
);
25+
assert!(
26+
(core::mem::offset_of!(ReprRustUnion, y) + core::mem::size_of::<[u32; 4]>())
27+
<= core::mem::size_of::<ReprRustUnion>()
28+
);
29+
assert!(
30+
(core::mem::offset_of!(ReprRustUnion, z) + core::mem::size_of::<f32>())
31+
<= core::mem::size_of::<ReprRustUnion>()
32+
);
33+
assert!(
34+
(core::mem::offset_of!(ReprRustUnion, a) + core::mem::size_of::<u128>())
35+
<= core::mem::size_of::<ReprRustUnion>()
36+
);
37+
}
38+
39+
fn test_size_modulo_align() {
40+
assert_eq!(core::mem::size_of::<ReprRustUnion>() % core::mem::align_of::<ReprRustUnion>(), 0);
41+
}
42+
43+
fn main() {
44+
test_size_contains_each_type();
45+
test_size_contains_all_fields();
46+
test_size_modulo_align();
47+
}

0 commit comments

Comments
 (0)
Failed to load comments.