---

yaml
---
r: 37807
b: refs/heads/try
c: 1088006
h: refs/heads/master
i:
  37805: 65c5808
  37803: ad366fb
  37799: 4645b44
  37791: b4083c2
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 8fa306a0adb9ef3677bfad9bbd21bb620d4dc5b5
+refs/heads/try: 1088006ed9a66f7bf7f4d4768b60b8bf165c160e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/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/try/src/test/run-pass/const-unit-struct.rs

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