From 336f22db61c6c582b4ef019fcfa739e813668fe1 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 11 Mar 2011 10:38:55 -0800 Subject: rustc: Resolve upvars as necessary --- src/comp/middle/trans.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/comp') diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 936a12f3..47bd63c8 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -3338,8 +3338,15 @@ fn trans_path(@block_ctxt cx, &ast.path p, &option.t[ast.def] dopt, ret lval_mem(cx, cx.fcx.llargs.get(did)); } case (ast.def_local(?did)) { - check (cx.fcx.lllocals.contains_key(did)); - ret lval_mem(cx, cx.fcx.lllocals.get(did)); + alt (cx.fcx.lllocals.find(did)) { + case (none[ValueRef]) { + check (cx.fcx.llupvars.contains_key(did)); + ret lval_mem(cx, cx.fcx.llupvars.get(did)); + } + case (some[ValueRef](?llval)) { + ret lval_mem(cx, llval); + } + } } case (ast.def_binding(?did)) { check (cx.fcx.lllocals.contains_key(did)); -- cgit v1.2.3