---

yaml
---
r: 39191
b: refs/heads/incoming
c: 1088006
h: refs/heads/master
i:
  39189: a790c0d
  39187: 0e85758
  39183: 7987a0a
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 8fa306a0adb9ef3677bfad9bbd21bb620d4dc5b5
+refs/heads/incoming: 1088006ed9a66f7bf7f4d4768b60b8bf165c160e
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/consts.rs

@@ -410,6 +410,11 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
 
                 C_named_struct(llty, ~[ lldiscrim, C_null(llstructtys[1]) ])
             }
+            Some(ast::def_class(_)) => {
+                let ety = ty::expr_ty(cx.tcx, e);
+                let llty = type_of::type_of(cx, ety);
+                C_null(llty)
+            }
             _ => {
                 cx.sess.span_bug(e.span,
                                  ~"expected a const, fn, or variant def")

branches/incoming/src/test/run-pass/const-unit-struct.rs

@@ -0,0 +1,10 @@
+struct Foo;
+
+const X: Foo = Foo;
+
+fn main() {
+    match X {
+        Foo => {}
+    }
+}
+