---

yaml
---
r: 22442
b: refs/heads/master
c: 62e9ae0
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 120773b2a7b6a1ca8ba859528f3e3cd9e574bf3d
+refs/heads/master: 62e9ae04e26f60124f6760df26b517bce450ae41
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rt/rust_shape.h

@@ -407,10 +407,6 @@ ctxt<T>::walk_tag0() {
     // Determine the size and alignment.
     tinfo.tag_sa = get_size_align(tinfo.info_ptr);
 
-    // Read in a dummy value; this used to be the number of parameters
-    uint16_t number_of_params = get_u16_bump(sp);
-    assert(number_of_params == 0 && "tag has type parameters on it");
-
     // Call to the implementation.
     static_cast<T *>(this)->walk_tag1(tinfo);
 }
@@ -489,10 +485,6 @@ ctxt<T>::walk_res0() {
         reinterpret_cast<const rust_fn **>(tables->resources);
     const rust_fn *dtor = resources[dtor_offset];
 
-    // Read in a dummy value; this used to be the number of parameters
-    uint16_t number_of_params = get_u16_bump(sp);
-    assert(number_of_params == 0 && "resource has type parameters on it");
-
     uint16_t sp_size = get_u16_bump(sp);
     const uint8_t *end_sp = sp + sp_size;
 

trunk/src/rustc/middle/trans/shape.rs

@@ -250,10 +250,6 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
             }
             add_u16(s, id as u16);
 
-            // Hack: always encode 0 tps, since the shape glue format
-            // hasn't changed since we started monomorphizing.
-            add_u16(s, 0_u16);
-
             s
           }
         }
@@ -342,10 +338,6 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
           let ri = @{did: dtor_did, parent_id: some(did), tps: tps};
           let id = interner::intern(ccx.shape_cx.resources, ri);
           add_u16(s, id as u16);
-
-          // 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);