Auto merge of #495 - flier:fix-493, r=emilio

check layout align before padding bytes

Fix issue #493 again :S

Still finding way to reproduce it

1 files changed, 4 insertions, 1 deletions

diff --git a/src/codegen/struct_layout.rs b/src/codegen/struct_layout.rs
index 98640570..f8a88bc2 100644
--- a/src/codegen/struct_layout.rs
+++ b/src/codegen/struct_layout.rs
@@ -89,9 +89,12 @@ impl<'a, 'ctx> StructLayoutTracker<'a, 'ctx> {
                     Some(offset) if offset / 8  > self.latest_offset => {
                         (offset / 8  - self.latest_offset, true)
                     }
-                    _ => {
+                    _ if field_layout.align != 0 => {
                         (self.padding_bytes(field_layout), (self.latest_offset % field_layout.align) != 0)
                     }
+                    _ => {
+                        (0, false)
+                    }
                 };
 
                 self.latest_offset += padding_bytes;