---

yaml
---
r: 10434
b: refs/heads/snap-stage3
c: baf58a7
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 665ba3531d60d26a0f582693255629040313d29d
+refs/heads/snap-stage3: baf58a764b4cc5ffc3de7bf43b549a4cc59a57a4
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustc/middle/trans/shape.rs

@@ -249,16 +249,10 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> [u8] {
             }
             add_u16(s, id as u16);
 
-            // Hack: always encode 0 tps, since we will encode
-            // a monomorpized version
+            // Hack: always encode 0 tps, since the shape glue format
+            // hasn't changed since we started monomorphizing.
             add_u16(s, 0_u16);
 
-            // add_u16(s, vec::len(tps) as u16);
-            // for vec::each(tps) {|tp|
-            //     let subshape = shape_of(ccx, tp, ty_param_map);
-            //     add_u16(s, vec::len(subshape) as u16);
-            //     s += subshape;
-            // }
             s
           }
         }
@@ -345,10 +339,10 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> [u8] {
           let ri = @{did: dtor_did, tps: tps};
           let id = interner::intern(ccx.shape_cx.resources, ri);
           add_u16(s, id as u16);
-          add_u16(s, vec::len(tps) as u16);
-          for vec::each(tps) {|tp|
-             add_substr(s, shape_of(ccx, tp));
-          }
+
+          // Hack: always encode 0 tps, since the shape glue format
+          // hasn't changed since we started monomorphizing.
+          add_u16(s, 0_u16);
         };
         for ty::class_items_as_mutable_fields(ccx.tcx, did, substs).each {|f|
             sub += shape_of(ccx, f.mt.ty);
@@ -374,10 +368,9 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> [u8] {
 
         let mut s = [shape_res];
         add_u16(s, id as u16);
-        add_u16(s, vec::len(tps) as u16);
-        for vec::each(tps) {|tp|
-            add_substr(s, shape_of(ccx, tp));
-        }
+        // Hack: always encode 0 tps, since the shape glue format
+        // hasn't changed since we started monomorphizing.
+        add_u16(s, 0_u16);
         add_substr(s, shape_of(ccx, subt));
         s
       }