---

luqmana · luqmana · commit 0d1a7089d277 · 2013-10-12T21:42:24.000-04:00
yaml --- r: 83081 b: refs/heads/auto c: 4b4b213 h: refs/heads/master i: 83079: a6fcd7d v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: c6e3501da14784cd2401dded3b53f3ce3405b4ec
+refs/heads/auto: 4b4b2136e048c39c60c8289f4cd1c870d4aaaeb0
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/trans/adt.rs b/branches/auto/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];`