---

yaml
---
r: 48510
b: refs/heads/snap-stage3
c: 40313fb
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fdd28451f68a14916c57c50baa045132316cedc6
+refs/heads/snap-stage3: 40313fb6b0104f703c06b2dd46198ad1f15d267b
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/expr.rs

@@ -722,14 +722,12 @@ fn trans_def_dps_unadjusted(bcx: block, ref_expr: @ast::expr,
                 let fn_data = callee::trans_fn_ref(bcx, vid, ref_expr.id);
                 Store(bcx, fn_data.llfn, lldest);
                 return bcx;
-            } else if !ty::enum_is_univariant(ccx.tcx, tid) {
-                // Nullary variant.
-                let lldiscrimptr = GEPi(bcx, lldest, [0u, 0u]);
-                let lldiscrim = C_int(bcx.ccx(), variant_info.disr_val);
-                Store(bcx, lldiscrim, lldiscrimptr);
-                return bcx;
             } else {
-                // Nullary univariant.
+                // Nullary variant.
+                let ty = expr_ty(bcx, ref_expr);
+                let repr = adt::represent_type(ccx, ty);
+                adt::trans_set_discr(bcx, &repr, lldest,
+                                     variant_info.disr_val);
                 return bcx;
             }
         }