diff options
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/middle/trans.rs | 5 | ||||
| -rw-r--r-- | src/comp/middle/trans_closure.rs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index ce106c78eac..39b28027428 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -937,7 +937,7 @@ fn trans_stack_local_derived_tydesc(cx: @block_ctxt, llsz: ValueRef, // Objects and closures store their type parameters differently (in the object // or closure itself rather than in the type descriptor). -tag ty_param_storage { tps_normal; tps_obj(uint); tps_fn(uint); } +tag ty_param_storage { tps_normal; tps_obj(uint); } fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool, storage: ty_param_storage, @@ -958,7 +958,7 @@ fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool, let is_obj_body; alt storage { tps_normal. { is_obj_body = false; } - tps_obj(_) | tps_fn(_) { is_obj_body = true; } + tps_obj(_) { is_obj_body = true; } } bcx_ccx(cx).stats.n_derived_tydescs += 1u; @@ -1006,7 +1006,6 @@ fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool, alt storage { tps_normal. { obj_params = 0u; } tps_obj(np) { obj_params = np; } - tps_fn(np) { obj_params = 0x80000000u | np; } } let v; diff --git a/src/comp/middle/trans_closure.rs b/src/comp/middle/trans_closure.rs index 852ee5e7b67..93cbbb6ae3c 100644 --- a/src/comp/middle/trans_closure.rs +++ b/src/comp/middle/trans_closure.rs @@ -55,7 +55,7 @@ fn build_environment(bcx: @block_ctxt, lltydescs: [ValueRef], }; } - let ccx = bcx_ccx(bcx); + //let ccx = bcx_ccx(bcx); let tcx = bcx_tcx(bcx); // First, synthesize a tuple type containing the types of all the |