Auto merge of #554 - emilio:union-pad, r=fitzgen

bors-servo · web-flow · commit b71c7ba46b59 · 2017-03-03T09:02:05.000-08:00
codegen: Don't pad union fields. Fixes #553
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
@@ -1136,9 +1136,11 @@ impl CodeGenerator for CompInfo {
                 }
             };
 
-            if let Some(padding_field) =
-                struct_layout.pad_field(&field_name, field_ty, field.offset()) {
-                fields.push(padding_field);
+            if !is_union {
+                if let Some(padding_field) =
+                    struct_layout.pad_field(&field_name, field_ty, field.offset()) {
+                    fields.push(padding_field);
+                }
             }
 
             let is_private = field.annotations()

Original file line number	Diff line number	Diff line change
`@@ -1136,9 +1136,11 @@ impl CodeGenerator for CompInfo {`
`1136`	`1136`	`}`
`1137`	`1137`	`};`
`1138`	`1138`
`1139`		`- if let Some(padding_field) =`
`1140`		`- struct_layout.pad_field(&field_name, field_ty, field.offset()) {`
`1141`		`- fields.push(padding_field);`
	`1139`	`+ if !is_union {`
	`1140`	`+ if let Some(padding_field) =`
	`1141`	`+ struct_layout.pad_field(&field_name, field_ty, field.offset()) {`
	`1142`	`+ fields.push(padding_field);`
	`1143`	`+ }`
`1142`	`1144`	`}`
`1143`	`1145`
`1144`	`1146`	`let is_private = field.annotations()`