---

yaml
---
r: 56733
b: refs/heads/try
c: e9a52f5
h: refs/heads/master
i:
  56731: 927de93
v: v3

Author: jld

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: 04b2c26f39782ba30ad8868f971d5d8a606fcf88
+refs/heads/try: e9a52f5af576ffd517284813858b6d06910460ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/front/intrinsic.rs

@@ -28,8 +28,7 @@ pub mod intrinsic {
         // Remaining fields not listed
     }
 
-    // FIXME: make this a 0-variant enum; trans/reflect.rs has to match it.
-    pub type Opaque = ();
+    pub enum Opaque { }
 
     pub trait TyVisitor {
         fn visit_bot(&self) -> bool;

branches/try/src/librustc/middle/trans/reflect.rs

@@ -274,12 +274,15 @@ pub impl Reflector {
             let repr = adt::represent_type(bcx.ccx(), t);
             let variants = ty::substd_enum_variants(ccx.tcx, did, substs);
             let llptrty = T_ptr(type_of(ccx, t));
+            let (_, opaquety) = *(ccx.tcx.intrinsic_defs.find(&ccx.sess.ident_of(~"Opaque"))
+                                      .expect("Failed to resolve intrinsic::Opaque"));
+            let opaqueptrty = ty::mk_ptr(ccx.tcx, ty::mt { ty: opaquety, mutbl: ast::m_imm });
 
             let make_get_disr = || {
                 let sub_path = bcx.fcx.path + ~[path_name(special_idents::anon)];
                 let sym = mangle_internal_name_by_path_and_seq(ccx, sub_path, ~"get_disr");
                 let args = [ty::arg { mode: ast::expl(ast::by_copy),
-                                      ty: ty::mk_nil_ptr(ccx.tcx) }];
+                                      ty: opaqueptrty }];
                 let llfty = type_of_fn(ccx, args, ty::mk_int(ccx.tcx));
                 let llfdecl = decl_internal_cdecl_fn(ccx.llmod, sym, llfty);
                 let arg = unsafe {