squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Register tuple cleanups after the tuple is built

Browse source 
Issue #936
This commit is contained in:
Brian Anderson 2011-09-19 17:04:04 -07:00
parent a18986c1a1
commit 9626e2f71f
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/comp/middle/trans.rs
View file

@ -3939,7 +3939,6 @@ fn trans_tup(cx: @block_ctxt, elts: [@ast::expr], id: ast::node_id) ->
let tup_res = alloc_ty(bcx, t);
let tup_val = tup_res.val;
bcx = tup_res.bcx;
add_clean_temp(cx, tup_val, t);
let i: int = 0;
for e in elts {
let e_ty = ty::expr_ty(cx.fcx.lcx.ccx.tcx, e);
@ -3951,6 +3950,9 @@ fn trans_tup(cx: @block_ctxt, elts: [@ast::expr], id: ast::node_id) ->
bcx = move_val_if_temp(dst_res.bcx, INIT, dst_res.val, src, e_ty);
i += 1;
}
// Only register the cleanups after the tuple is built
add_clean_temp(cx, tup_val, t);
ret rslt(bcx, tup_val);
}

9
src/test/run-fail/unwind-tup.rs Normal file
View file

@ -0,0 +1,9 @@
// error-pattern:fail
fn fold_local() -> @[int]{
fail;
}
fn main() {
let lss = (fold_local(), 0);
}