mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make for loops alias the vec elements, rather than copy them"

Browse Source 
This reverts commit 985ef59efd971f1d6b9bf4b5e484b75733e00444.
This commit is contained in:
Marijn Haverbeke 2011-09-09 16:26:53 +02:00
parent 3ac59b0ee0
commit db15591d89
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2478,13 +2478,19 @@ fn trans_for(cx: &@block_ctxt, local: &@ast::local, seq: &@ast::expr,
fn inner(cx: &@block_ctxt, local: @ast::local, curr: ValueRef, t: ty::t,
body: &ast::blk, outer_next_cx: @block_ctxt) -> @block_ctxt {
let next_cx = new_sub_block_ctxt(cx, "next");
let bcx = new_loop_scope_block_ctxt(cx, option::some(next_cx),
outer_next_cx, "for loop scope");
Br(cx, bcx.llbb);
let val = PointerCast(bcx, curr, T_ptr(type_of_or_i8(cx, t)));
let bcx = trans_alt::bind_irrefutable_pat(bcx, local.node.pat, val,
let scope_cx =
new_loop_scope_block_ctxt(cx,
option::some::<@block_ctxt>(next_cx),
outer_next_cx, "for loop scope");
Br(cx, scope_cx.llbb);
let {bcx, val: dst} = alloc_local(scope_cx, local);
let val = load_if_immediate(bcx, PointerCast(bcx, curr,
val_ty(dst)), t);
let bcx = copy_val(bcx, INIT, dst, val, t);
add_clean(scope_cx, dst, t);
let bcx = trans_alt::bind_irrefutable_pat(bcx, local.node.pat, dst,
cx.fcx.lllocals, false);
let bcx = trans_block(bcx, body, return).bcx;
bcx = trans_block(bcx, body, return).bcx;
if !is_terminated(bcx) {
Br(bcx, next_cx.llbb);
// otherwise, this code is unreachable