]> git.lizzy.rs Git - rust.git/commitdiff
restore old buggy behavior where n_obj_params is always 0 for fns
authorNiko Matsakis <niko@alum.mit.edu>
Thu, 15 Dec 2011 21:20:43 +0000 (13:20 -0800)
committerNiko Matsakis <niko@alum.mit.edu>
Thu, 15 Dec 2011 21:44:06 +0000 (13:44 -0800)
src/comp/middle/trans_closure.rs

index 1ee5a9ede676297bdfe3274d77e4d83587d4ae18..039709db8d672bddebdd020a9abeaf0423f779ab 100644 (file)
@@ -190,7 +190,15 @@ fn maybe_clone_tydesc(bcx: @block_ctxt,
       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);