---

yaml
---
r: 11092
b: refs/heads/master
c: b28a555
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3bd0338c19a594d538bc6dd4656c0cb8da9b9680
+refs/heads/master: b28a5552e3e822063499c8fb7c6c0be6bb881863
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/comp/metadata/tydecode.rs

@@ -301,6 +301,7 @@ fn parse_ty(st: @pstate, conv: conv_did) -> ty::t {
         let inner = parse_ty(st, conv);
         ty::mk_named(st.tcx, inner, name)
       }
+      'B' { ty::mk_opaque_box(st.tcx) }
       c { #error("unexpected char in type string: %c", c); fail;}
     }
 }

trunk/src/comp/metadata/tyencode.rs

@@ -192,6 +192,7 @@ fn enc_sty(w: io::writer, cx: @ctxt, st: ty::sty) {
         for tc: @ty::type_constr in cs { enc_ty_constr(w, cx, tc); }
         w.write_char(']');
       }
+      ty::ty_opaque_box { w.write_char('B'); }
     }
 }
 fn enc_proto(w: io::writer, proto: proto) {

trunk/src/comp/middle/shape.rs

@@ -381,6 +381,10 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t, ty_param_map: [uint]) -> [u8] {
         s += [shape_box];
         add_substr(s, shape_of(ccx, mt.ty, ty_param_map));
       }
+      ty::ty_opaque_box {
+        s += [shape_box];
+        add_substr(s, [shape_u8]);
+      }
       ty::ty_uniq(mt) {
         s += [shape_uniq];
         add_substr(s, shape_of(ccx, mt.ty, ty_param_map));