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

2013-10-12 21:42:24 -04:00 · 2013-10-12 21:42:24 -04:00 · 4b4b2136e0
commit 4b4b2136e0
parent c6e3501da1
1 changed files with 6 additions and 1 deletions
--- 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];