---

yaml
---
r: 6717
b: refs/heads/master
c: aa3d58c
h: refs/heads/master
i:
  6715: 777a1f2
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e3259e119b6370267415b9e07f3ea80869f839d
+refs/heads/master: aa3d58c8c0a2e52b2893328a8d1940e5fbd41303

trunk/src/comp/middle/trans_closure.rs

@@ -190,7 +190,15 @@ fn store_environment(
       ty::closure_shared. | ty::closure_send. {
         let bound_tydesc = GEPi(bcx, closure, [0, abi::closure_elt_tydesc]);
         let ti = none;
-        let tps = tps_fn(vec::len(lltydescs));
+
+        // NDM I believe this is the correct value,
+        // but using it exposes bugs and limitations
+        // in the shape code.  Therefore, I am using
+        // tps_normal, which is what we used before.
+        //
+        // let tps = tps_fn(vec::len(lltydescs));
+
+        let tps = tps_normal;
         let {result:closure_td, _} =
             trans::get_tydesc(bcx, closure_ty, true, tps, ti);
         trans::lazily_emit_tydesc_glue(bcx, abi::tydesc_field_drop_glue, ti);