bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Bind tag members as aliases rather than new locals.

Browse source
This commit is contained in:
Graydon Hoare 2011-04-25 03:59:35 +00:00
parent 5fe21b5af0
commit 1b9e6b3ad2
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3752,24 +3752,27 @@ fn trans_pat_match(@block_ctxt cx, @ast.pat pat, ValueRef llval,
fail; fail;
} }
fn trans_pat_binding(@block_ctxt cx, @ast.pat pat, ValueRef llval) fn trans_pat_binding(@block_ctxt cx, @ast.pat pat,
ValueRef llval, bool bind_alias)
-> result { -> result {
alt (pat.node) { alt (pat.node) {
case (ast.pat_wild(_)) { ret res(cx, llval); } case (ast.pat_wild(_)) { ret res(cx, llval); }
case (ast.pat_lit(_, _)) { ret res(cx, llval); } case (ast.pat_lit(_, _)) { ret res(cx, llval); }
case (ast.pat_bind(?id, ?def_id, ?ann)) { case (ast.pat_bind(?id, ?def_id, ?ann)) {
auto ty = node_ann_type(cx.fcx.lcx.ccx, ann); if (bind_alias) {
cx.fcx.lllocals.insert(def_id, llval);
auto rslt = alloc_ty(cx, ty); ret res(cx, llval);
auto dst = rslt.val; } else {
auto bcx = rslt.bcx; auto t = node_ann_type(cx.fcx.lcx.ccx, ann);
auto rslt = alloc_ty(cx, t);
llvm.LLVMSetValueName(dst, _str.buf(id)); auto dst = rslt.val;
bcx.fcx.lllocals.insert(def_id, dst); auto bcx = rslt.bcx;
bcx.cleanups += llvm.LLVMSetValueName(dst, _str.buf(id));
vec(clean(bind drop_slot(_, dst, ty))); bcx.fcx.lllocals.insert(def_id, dst);
bcx.cleanups +=
ret copy_ty(bcx, INIT, dst, llval, ty); vec(clean(bind drop_slot(_, dst, t)));
ret copy_ty(bcx, INIT, dst, llval, t);
}
} }
case (ast.pat_tag(_, ?subpats, ?vdef_opt, ?ann)) { case (ast.pat_tag(_, ?subpats, ?vdef_opt, ?ann)) {
if (_vec.len[@ast.pat](subpats) == 0u) { ret res(cx, llval); } if (_vec.len[@ast.pat](subpats) == 0u) { ret res(cx, llval); }
@ -3789,12 +3792,8 @@ fn trans_pat_binding(@block_ctxt cx, @ast.pat pat, ValueRef llval)
auto rslt = GEP_tag(this_cx, llblobptr, vdef._0, vdef._1, auto rslt = GEP_tag(this_cx, llblobptr, vdef._0, vdef._1,
ty_param_substs, i); ty_param_substs, i);
this_cx = rslt.bcx; this_cx = rslt.bcx;
auto llsubvalptr = rslt.val;
auto llsubval = load_if_immediate(this_cx, llsubvalptr,
pat_ty(cx.fcx.lcx.ccx.tystore, subpat));
auto subpat_res = trans_pat_binding(this_cx, subpat, auto subpat_res = trans_pat_binding(this_cx, subpat,
llsubval); rslt.val, true);
this_cx = subpat_res.bcx; this_cx = subpat_res.bcx;
i += 1; i += 1;
} }
@ -3819,7 +3818,7 @@ fn trans_alt(@block_ctxt cx, @ast.expr expr,
match_res.bcx.build.Br(binding_cx.llbb); match_res.bcx.build.Br(binding_cx.llbb);
auto binding_res = trans_pat_binding(binding_cx, arm.pat, auto binding_res = trans_pat_binding(binding_cx, arm.pat,
expr_res.val); expr_res.val, false);
auto block_res = trans_block(binding_res.bcx, arm.block); auto block_res = trans_block(binding_res.bcx, arm.block);
arm_results += vec(block_res); arm_results += vec(block_res);