Use field align if it's smaller than pack align

Fixes #2695
rust-lang · Jan 12, 2024 · 5ac0381 · 5ac0381
1 parent 8fffbf8
commit 5ac0381
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bindgen/codegen/struct_layout.rs b/bindgen/codegen/struct_layout.rs
@@ -212,7 +212,10 @@ impl<'a> StructLayoutTracker<'a> {
                     0
                 } else if !self.is_packed {
                     self.padding_bytes(field_layout)
-                } else if let Some(l) = self.known_type_layout {
+                } else if let Some(mut l) = self.known_type_layout {
+                    if field_layout.align < l.align {
+                        l.align = field_layout.align;
+                    }
                     self.padding_bytes(l)
                 } else {
                     0