librustc: Don't ICE on packed structs in statics.

luqmana · luqmana · commit 4b4b2136e048 · 2013-10-12T21:42:24.000-04:00
diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs
@@ -505,7 +505,12 @@ pub fn trans_const(ccx: &mut CrateContext, r: &Repr, discr: Disr,
         }
         Univariant(ref st, _dro) => {
             assert_eq!(discr, 0);
-            C_struct(build_const_struct(ccx, st, vals))
+            let contents = build_const_struct(ccx, st, vals);
+            if st.packed {
+                C_packed_struct(contents)
+            } else {
+                C_struct(contents)
+            }
         }
         General(ref cases) => {
             let case = &cases[discr];

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,12 @@ pub fn trans_const(ccx: &mut CrateContext, r: &Repr, discr: Disr,`
`505`	`505`	`}`
`506`	`506`	`Univariant(ref st, _dro) => {`
`507`	`507`	`assert_eq!(discr, 0);`
`508`		`- C_struct(build_const_struct(ccx, st, vals))`
	`508`	`+ let contents = build_const_struct(ccx, st, vals);`
	`509`	`+ if st.packed {`
	`510`	`+ C_packed_struct(contents)`
	`511`	`+ } else {`
	`512`	`+ C_struct(contents)`
	`513`	`+ }`
`509`	`514`	`}`
`510`	`515`	`General(ref cases) => {`
`511`	`516`	`let case = &cases[discr];`