---

marijnh · marijnh · commit 2ea81310de67 · 2011-10-14T11:27:16.000+02:00
yaml --- r: 5819 b: refs/heads/master c: 0a01144 h: refs/heads/master i: 5817: fdb06ec 5815: 48d4897 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06257d66e7654660e98bab1a63dea9f0c5bd0ec1
+refs/heads/master: 0a01144797080f41cd9ee15a1d35157c4ad3f56a
diff --git a/trunk/src/comp/middle/trans.rs b/trunk/src/comp/middle/trans.rs
@@ -4272,7 +4272,7 @@ fn trans_temp_lval(bcx: @block_ctxt, e: @ast::expr) -> lval_result {
             ret {bcx: bcx, val: *cell, kind: temporary};
         } else {
             let {bcx, val: scratch} = alloc_ty(bcx, ty);
-            bcx = trans_expr(bcx, e, save_in(scratch));
+            bcx = trans_expr_save_in(bcx, e, scratch);
             add_clean_temp(bcx, scratch, ty);
             ret {bcx: bcx, val: scratch, kind: temporary};
         }
diff --git a/trunk/src/comp/middle/trans_objects.rs b/trunk/src/comp/middle/trans_objects.rs
@@ -370,7 +370,7 @@ fn trans_anon_obj(bcx: @block_ctxt, sp: span, anon_obj: ast::anon_obj,
             check type_is_tup_like(bcx, body_ty);
             let {bcx: cx, val: body_inner_obj} = GEP_tup_like
                 (bcx, body_ty, body, [0, abi::obj_body_elt_inner_obj]);
-            bcx = trans_expr(cx, e, save_in(body_inner_obj));
+            bcx = trans_expr_save_in(cx, e, body_inner_obj);
           }
         }
         revoke_clean(bcx, box);

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 06257d66e7654660e98bab1a63dea9f0c5bd0ec1`
	`2`	`+refs/heads/master: 0a01144797080f41cd9ee15a1d35157c4ad3f56a`
Original file line number	Diff line number	Diff line change
`@@ -4272,7 +4272,7 @@ fn trans_temp_lval(bcx: @block_ctxt, e: @ast::expr) -> lval_result {`
`4272`	`4272`	`ret {bcx: bcx, val: *cell, kind: temporary};`
`4273`	`4273`	`} else {`
`4274`	`4274`	`let {bcx, val: scratch} = alloc_ty(bcx, ty);`
`4275`		`- bcx = trans_expr(bcx, e, save_in(scratch));`
	`4275`	`+ bcx = trans_expr_save_in(bcx, e, scratch);`
`4276`	`4276`	`add_clean_temp(bcx, scratch, ty);`
`4277`	`4277`	`ret {bcx: bcx, val: scratch, kind: temporary};`
`4278`	`4278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ fn trans_anon_obj(bcx: @block_ctxt, sp: span, anon_obj: ast::anon_obj,`
`370`	`370`	`check type_is_tup_like(bcx, body_ty);`
`371`	`371`	`let {bcx: cx, val: body_inner_obj} = GEP_tup_like`
`372`	`372`	`(bcx, body_ty, body, [0, abi::obj_body_elt_inner_obj]);`
`373`		`- bcx = trans_expr(cx, e, save_in(body_inner_obj));`
	`373`	`+ bcx = trans_expr_save_in(cx, e, body_inner_obj);`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`	`revoke_clean(bcx, box);`