---

luqmana · luqmana · commit 0a3135f7c257 · 2013-10-12T21:42:24.000-04:00
yaml --- r: 83871 b: refs/heads/try c: 4b4b213 h: refs/heads/master i: 83869: 478e99b 83867: 35d36db 83863: 8a133bf 83855: 81cd59d 83839: 548a4d2 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: c6e3501da14784cd2401dded3b53f3ce3405b4ec
+refs/heads/try: 4b4b2136e048c39c60c8289f4cd1c870d4aaaeb0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/librustc/middle/trans/adt.rs b/branches/try/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];`