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

bors-servo · web-flow · commit 8264afa875d6 · 2017-02-08T03:55:29.000-08:00
check empty layout when padding bytes fast workaround to fix issue #493 need to investigate why layout is empty
diff --git a/src/codegen/struct_layout.rs b/src/codegen/struct_layout.rs
@@ -163,7 +163,11 @@ impl<'a, 'ctx> StructLayoutTracker<'a, 'ctx> {
     }
 
     fn padding_bytes(&self, layout: Layout) -> usize {
-        if self.latest_offset % layout.align == 0 {
+        if layout.align == 0 {
+            warn!("try to padding bytes without layout");
+
+            0
+        } else if self.latest_offset % layout.align == 0 {
             0
         } else {
             layout.align - (self.latest_offset % layout.align)

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,11 @@ impl<'a, 'ctx> StructLayoutTracker<'a, 'ctx> {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`fn padding_bytes(&self, layout: Layout) -> usize {`
`166`		`- if self.latest_offset % layout.align == 0 {`
	`166`	`+ if layout.align == 0 {`
	`167`	`+ warn!("try to padding bytes without layout");`
	`168`	`+`
	`169`	`+ 0`
	`170`	`+ } else if self.latest_offset % layout.align == 0 {`
`167`	`171`	`0`
`168`	`172`	`} else {`
`169`	`173`	`layout.align - (self.latest_offset % layout.align)`