OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure by-copy arguments take last-use into account

Browse Source
This commit is contained in:
Marijn Haverbeke 2011-11-18 16:43:30 +01:00
parent 1cccefd8bb
commit 8cf3ca3b55
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/comp/middle/trans.rs
View File

@ -3621,13 +3621,19 @@ fn trans_arg_expr(cx: @block_ctxt, arg: ty::arg, lldestty0: TypeRef,
} }
} else if arg.mode == ast::by_copy { } else if arg.mode == ast::by_copy {
let {bcx: cx, val: alloc} = alloc_ty(bcx, e_ty); let {bcx: cx, val: alloc} = alloc_ty(bcx, e_ty);
let last_use = ccx.last_uses.contains_key(e.id);
bcx = cx; bcx = cx;
if lv.kind == temporary { revoke_clean(bcx, val); } if lv.kind == temporary { revoke_clean(bcx, val); }
if lv.kind == owned || !ty::type_is_immediate(ccx.tcx, e_ty) { if lv.kind == owned || !ty::type_is_immediate(ccx.tcx, e_ty) {
bcx = memmove_ty(bcx, alloc, val, e_ty); bcx = memmove_ty(bcx, alloc, val, e_ty);
if last_use && ty::type_needs_drop(ccx.tcx, e_ty) {
bcx = zero_alloca(bcx, val, e_ty);
}
} else { Store(bcx, val, alloc); } } else { Store(bcx, val, alloc); }
val = alloc; val = alloc;
if lv.kind != temporary { bcx = take_ty(bcx, val, e_ty); } if lv.kind != temporary && !last_use {
bcx = take_ty(bcx, val, e_ty);
}
} else if ty::type_is_immediate(ccx.tcx, e_ty) && lv.kind != owned { } else if ty::type_is_immediate(ccx.tcx, e_ty) && lv.kind != owned {
let r = do_spill(bcx, val, e_ty); let r = do_spill(bcx, val, e_ty);
val = r.val; val = r.val;