---

yaml
---
r: 41703
b: refs/heads/master
c: 349fa1e
h: refs/heads/master
i:
  41701: 565e1ff
  41699: 6829f26
  41695: a2b04cd
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: abae61257c4d866bb321bfb80ad16b7531736f7e
+refs/heads/master: 349fa1e550905577fd9545aada328fb0806cf641
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/trans/consts.rs

@@ -414,21 +414,10 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                     // variant or we wouldn't have gotten here -- the constant
                     // checker forbids paths that don't map to C-like enum
                     // variants.
-                    let ety = ty::expr_ty(cx.tcx, e);
-                    let llty = type_of::type_of(cx, ety);
                     let lldiscrim = base::get_discrim_val(cx, e.span,
                                                           enum_did,
                                                           variant_did);
-
-                    let fields = if ty::enum_is_univariant(cx.tcx, enum_did) {
-                        ~[lldiscrim]
-                    } else {
-                        let llstructtys =
-                            lib::llvm::struct_element_types(llty);
-                        ~[lldiscrim, C_null(llstructtys[1])]
-                    };
-
-                    C_named_struct(llty, fields)
+                    C_struct(~[lldiscrim])
                 }
                 Some(ast::def_struct(_)) => {
                     let ety = ty::expr_ty(cx.tcx, e);