Auto merge of #1137 - fitzgen:divide-by-zero-in-struct-layout, r=emilio

Divide by zero in struct layout See commit messages for details. r? @emilio or @pepyakin
rust-lang · Nov 2, 2017 · f059ede · f059ede
2 parents 0e84605 + 460aaa0
commit f059ede
Show file tree

Hide file tree

Showing 192 changed files with 1,092 additions and 1,289 deletions.
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
@@ -1787,9 +1787,13 @@ impl CodeGenerator for CompInfo {
                                         let field_name = ctx.rust_ident(name);
 
                                         Some(quote! {
-                                            assert_eq!(unsafe { &(*(0 as *const #canonical_ident)).#field_name as *const _ as usize },
-                                                       #field_offset,
-                                                       concat!("Alignment of field: ", stringify!(#canonical_ident), "::", stringify!(#field_name)));
+                                            assert_eq!(
+                                                unsafe {
+                                                    &(*(0 as *const #canonical_ident)).#field_name as *const _ as usize
+                                                },
+                                                #field_offset,
+                                                concat!("Offset of field: ", stringify!(#canonical_ident), "::", stringify!(#field_name))
+                                            );
                                         })
                                     })
                                 })

diff --git a/src/codegen/struct_layout.rs b/src/codegen/struct_layout.rs
@@ -335,9 +335,12 @@ impl<'a> StructLayoutTracker<'a> {
             new_field_layout
         );
 
+        // Avoid divide-by-zero errors if align is 0.
+        let align = cmp::max(1, layout.align);
+
         if self.last_field_was_bitfield &&
-            new_field_layout.align <= layout.size % layout.align &&
-            new_field_layout.size <= layout.size % layout.align
+            new_field_layout.align <= layout.size % align &&
+            new_field_layout.size <= layout.size % align
         {
             // The new field will be coalesced into some of the remaining bits.
             //

diff --git a/tests/expectations/tests/16-byte-alignment.rs b/tests/expectations/tests/16-byte-alignment.rs
@@ -48,7 +48,7 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(dport)
@@ -60,7 +60,7 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         2usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(sport)
@@ -83,7 +83,7 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1() {
         unsafe { &(*(0 as *const rte_ipv4_tuple__bindgen_ty_1)).sctp_tag as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple__bindgen_ty_1),
             "::",
             stringify!(sctp_tag)
@@ -111,7 +111,7 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
         unsafe { &(*(0 as *const rte_ipv4_tuple)).src_addr as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple),
             "::",
             stringify!(src_addr)
@@ -121,7 +121,7 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
         unsafe { &(*(0 as *const rte_ipv4_tuple)).dst_addr as *const _ as usize },
         4usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple),
             "::",
             stringify!(dst_addr)
@@ -177,7 +177,7 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(dport)
@@ -189,7 +189,7 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         2usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(sport)
@@ -212,7 +212,7 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1() {
         unsafe { &(*(0 as *const rte_ipv6_tuple__bindgen_ty_1)).sctp_tag as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple__bindgen_ty_1),
             "::",
             stringify!(sctp_tag)
@@ -240,7 +240,7 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
         unsafe { &(*(0 as *const rte_ipv6_tuple)).src_addr as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple),
             "::",
             stringify!(src_addr)
@@ -250,7 +250,7 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
         unsafe { &(*(0 as *const rte_ipv6_tuple)).dst_addr as *const _ as usize },
         16usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple),
             "::",
             stringify!(dst_addr)
@@ -280,7 +280,7 @@ fn bindgen_test_layout_rte_thash_tuple() {
         unsafe { &(*(0 as *const rte_thash_tuple)).v4 as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_thash_tuple),
             "::",
             stringify!(v4)
@@ -290,7 +290,7 @@ fn bindgen_test_layout_rte_thash_tuple() {
         unsafe { &(*(0 as *const rte_thash_tuple)).v6 as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_thash_tuple),
             "::",
             stringify!(v6)

diff --git a/tests/expectations/tests/16-byte-alignment_1_0.rs b/tests/expectations/tests/16-byte-alignment_1_0.rs
@@ -91,7 +91,7 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(dport)
@@ -103,7 +103,7 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         2usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(sport)
@@ -131,7 +131,7 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1() {
         unsafe { &(*(0 as *const rte_ipv4_tuple__bindgen_ty_1)).sctp_tag as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple__bindgen_ty_1),
             "::",
             stringify!(sctp_tag)
@@ -159,7 +159,7 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
         unsafe { &(*(0 as *const rte_ipv4_tuple)).src_addr as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple),
             "::",
             stringify!(src_addr)
@@ -169,7 +169,7 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
         unsafe { &(*(0 as *const rte_ipv4_tuple)).dst_addr as *const _ as usize },
         4usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv4_tuple),
             "::",
             stringify!(dst_addr)
@@ -225,7 +225,7 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(dport)
@@ -237,7 +237,7 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
         },
         2usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1),
             "::",
             stringify!(sport)
@@ -265,7 +265,7 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1() {
         unsafe { &(*(0 as *const rte_ipv6_tuple__bindgen_ty_1)).sctp_tag as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple__bindgen_ty_1),
             "::",
             stringify!(sctp_tag)
@@ -293,7 +293,7 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
         unsafe { &(*(0 as *const rte_ipv6_tuple)).src_addr as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple),
             "::",
             stringify!(src_addr)
@@ -303,7 +303,7 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
         unsafe { &(*(0 as *const rte_ipv6_tuple)).dst_addr as *const _ as usize },
         16usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_ipv6_tuple),
             "::",
             stringify!(dst_addr)
@@ -333,7 +333,7 @@ fn bindgen_test_layout_rte_thash_tuple() {
         unsafe { &(*(0 as *const rte_thash_tuple)).v4 as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_thash_tuple),
             "::",
             stringify!(v4)
@@ -343,7 +343,7 @@ fn bindgen_test_layout_rte_thash_tuple() {
         unsafe { &(*(0 as *const rte_thash_tuple)).v6 as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(rte_thash_tuple),
             "::",
             stringify!(v6)

diff --git a/tests/expectations/tests/accessors.rs b/tests/expectations/tests/accessors.rs
@@ -31,7 +31,7 @@ fn bindgen_test_layout_SomeAccessors() {
         unsafe { &(*(0 as *const SomeAccessors)).mNoAccessor as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(SomeAccessors),
             "::",
             stringify!(mNoAccessor)
@@ -41,7 +41,7 @@ fn bindgen_test_layout_SomeAccessors() {
         unsafe { &(*(0 as *const SomeAccessors)).mBothAccessors as *const _ as usize },
         4usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(SomeAccessors),
             "::",
             stringify!(mBothAccessors)
@@ -51,7 +51,7 @@ fn bindgen_test_layout_SomeAccessors() {
         unsafe { &(*(0 as *const SomeAccessors)).mUnsafeAccessors as *const _ as usize },
         8usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(SomeAccessors),
             "::",
             stringify!(mUnsafeAccessors)
@@ -61,7 +61,7 @@ fn bindgen_test_layout_SomeAccessors() {
         unsafe { &(*(0 as *const SomeAccessors)).mImmutableAccessor as *const _ as usize },
         12usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(SomeAccessors),
             "::",
             stringify!(mImmutableAccessor)
@@ -113,7 +113,7 @@ fn bindgen_test_layout_AllAccessors() {
         unsafe { &(*(0 as *const AllAccessors)).mBothAccessors as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(AllAccessors),
             "::",
             stringify!(mBothAccessors)
@@ -123,7 +123,7 @@ fn bindgen_test_layout_AllAccessors() {
         unsafe { &(*(0 as *const AllAccessors)).mAlsoBothAccessors as *const _ as usize },
         4usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(AllAccessors),
             "::",
             stringify!(mAlsoBothAccessors)
@@ -171,7 +171,7 @@ fn bindgen_test_layout_AllUnsafeAccessors() {
         unsafe { &(*(0 as *const AllUnsafeAccessors)).mBothAccessors as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(AllUnsafeAccessors),
             "::",
             stringify!(mBothAccessors)
@@ -181,7 +181,7 @@ fn bindgen_test_layout_AllUnsafeAccessors() {
         unsafe { &(*(0 as *const AllUnsafeAccessors)).mAlsoBothAccessors as *const _ as usize },
         4usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(AllUnsafeAccessors),
             "::",
             stringify!(mAlsoBothAccessors)
@@ -234,7 +234,7 @@ fn bindgen_test_layout_ContradictAccessors() {
         unsafe { &(*(0 as *const ContradictAccessors)).mBothAccessors as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(ContradictAccessors),
             "::",
             stringify!(mBothAccessors)
@@ -244,7 +244,7 @@ fn bindgen_test_layout_ContradictAccessors() {
         unsafe { &(*(0 as *const ContradictAccessors)).mNoAccessors as *const _ as usize },
         4usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(ContradictAccessors),
             "::",
             stringify!(mNoAccessors)
@@ -254,7 +254,7 @@ fn bindgen_test_layout_ContradictAccessors() {
         unsafe { &(*(0 as *const ContradictAccessors)).mUnsafeAccessors as *const _ as usize },
         8usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(ContradictAccessors),
             "::",
             stringify!(mUnsafeAccessors)
@@ -264,7 +264,7 @@ fn bindgen_test_layout_ContradictAccessors() {
         unsafe { &(*(0 as *const ContradictAccessors)).mImmutableAccessor as *const _ as usize },
         12usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(ContradictAccessors),
             "::",
             stringify!(mImmutableAccessor)
@@ -315,7 +315,7 @@ fn bindgen_test_layout_Replaced() {
         unsafe { &(*(0 as *const Replaced)).mAccessor as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(Replaced),
             "::",
             stringify!(mAccessor)
@@ -354,7 +354,7 @@ fn bindgen_test_layout_Wrapper() {
         unsafe { &(*(0 as *const Wrapper)).mReplaced as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(Wrapper),
             "::",
             stringify!(mReplaced)

diff --git a/tests/expectations/tests/annotation_hide.rs b/tests/expectations/tests/annotation_hide.rs
@@ -45,7 +45,7 @@ fn bindgen_test_layout_NotAnnotated() {
         unsafe { &(*(0 as *const NotAnnotated)).f as *const _ as usize },
         0usize,
         concat!(
-            "Alignment of field: ",
+            "Offset of field: ",
             stringify!(NotAnnotated),
             "::",
             stringify!(f)