---

yaml
---
r: 4275
b: refs/heads/master
c: 6a4d0ce
h: refs/heads/master
i:
  4273: 46f4084
  4271: f587b0a
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7efbad674ab1cdec36af3143d7b64baa5133b067
+refs/heads/master: 6a4d0ce829d999900199c6af53592537727ea5e9

trunk/src/comp/middle/tstate/auxiliary.rs

@@ -510,6 +510,9 @@ fn node_id_to_def_strict(cx: &ty::ctxt, id: node_id) -> def {
 fn node_id_to_def(ccx: &crate_ctxt, id: node_id) -> option::t[def] {
     ret ccx.tcx.def_map.find(id);
 }
+fn node_id_to_def_upvar(cx: &fn_ctxt, id: node_id) -> option::t[def] {
+    ret freevars::def_lookup(cx.ccx.tcx, cx.id, id);
+}
 
 fn norm_a_constraint(id: def_id, c: &constraint) -> norm_constraint[] {
     alt c {

trunk/src/comp/middle/tstate/pre_post_conditions.rs

@@ -218,7 +218,7 @@ fn join_then_else(fcx: &fn_ctxt, antec: &@expr, conseq: &blk,
 
 fn gen_if_local(fcx: &fn_ctxt, lhs: @expr, rhs: @expr, larger_id: node_id,
                 new_var: node_id, pth: &path) {
-    alt node_id_to_def(fcx.ccx, new_var) {
+    alt node_id_to_def_upvar(fcx, new_var) {
       some(d) {
         alt d {
           def_local(d_id) {
@@ -257,7 +257,7 @@ fn handle_update(fcx: &fn_ctxt, parent: &@expr, lhs: &@expr, rhs: &@expr,
           }
           _ {
             // pure and assign_op require the lhs to be init'd
-            let df = node_id_to_def_strict(fcx.ccx.tcx, lhs.id);
+            let df = node_id_to_def_upvar_strict(fcx, lhs.id);
             alt df {
               def_local(d_id) {
                 let i =