---

yaml
---
r: 52124
b: refs/heads/dist-snap
c: 78aad60
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 3a570075b191832e8ed63e018db871017132701a
+refs/heads/dist-snap: 78aad60062f7cd5fe6decff6319f6f75e566e08f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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);

branches/dist-snap/src/test/run-pass/const-nullary-univariant-enum.rs

@@ -0,0 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+enum Foo {
+    Bar = 0xDEADBEE
+}
+
+const X: Foo = Bar;
+
+fn main() {
+    assert((X as uint) == 0xDEADBEE);
+}