---

yaml
---
r: 41566
b: refs/heads/master
c: 6043a72
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8f8b4178111edccd2772946c965272142cdaa374
+refs/heads/master: 6043a72774b1541aa165453fb2fdb96b58faaf86
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

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

@@ -398,7 +398,6 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                 // 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 llstructtys = lib::llvm::struct_element_types(llty);
 
                 // Can't use `discrims` from the crate context here because
                 // those discriminants have an extra level of indirection,
@@ -422,8 +421,14 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                         lldiscrim = found_lldiscrim;
                     }
                 }
+                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, ~[ lldiscrim, C_null(llstructtys[1]) ])
+                C_named_struct(llty, fields)
             }
             Some(ast::def_struct(_)) => {
                 let ety = ty::expr_ty(cx.tcx, e);

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

@@ -230,7 +230,7 @@ fn fill_type_of_enum(cx: @crate_ctxt, did: ast::def_id, t: ty::t,
     debug!("type_of_enum %?: %?", t, ty::get(t));
 
     let lltys = {
-        let degen = ty::enum_is_univariant(cx.tcx, did);
+        let degen = (*ty::enum_variants(cx.tcx, did)).len() == 1u;
         let size = shape::static_size_of_enum(cx, t);
         if !degen {
             ~[T_enum_discrim(cx), T_array(T_i8(), size)]