---

catamorphism · catamorphism · commit 90203982eda8 · 2012-03-01T09:16:26.000-08:00
yaml --- r: 11563 b: refs/heads/master c: 48c763c h: refs/heads/master i: 11561: 832bbcf 11559: 4cc351f v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 03984561d43130cb8d51025604ac882470d47e3c
+refs/heads/master: 48c763c098a5609a52862ff57401087b9f162bec
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/comp/middle/tstate/states.rs b/trunk/src/comp/middle/tstate/states.rs
@@ -190,8 +190,8 @@ fn find_pre_post_state_call(fcx: fn_ctxt, pres: prestate, a: @expr,
                                         %u exprs vs. %u ops",
                                        vec::len(bs), vec::len(ops)]);
     }
-    ret find_pre_post_state_exprs(fcx, expr_poststate(fcx.ccx, a), id, ops,
-                                  bs, cf) || changed;
+    ret find_pre_post_state_exprs(fcx, pres, id, ops,
+                                   bs, cf) || changed;
 }
 
 fn find_pre_post_state_exprs(fcx: fn_ctxt, pres: prestate, id: node_id,
diff --git a/trunk/src/test/run-pass/issue-1895.rs b/trunk/src/test/run-pass/issue-1895.rs
@@ -0,0 +1,7 @@
+fn main() {
+  let x = 1;
+  let y = fn@[move x]() -> int {
+             x
+          }();
+}
+

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,8 @@ fn find_pre_post_state_call(fcx: fn_ctxt, pres: prestate, a: @expr,`
`190`	`190`	`%u exprs vs. %u ops",`
`191`	`191`	`vec::len(bs), vec::len(ops)]);`
`192`	`192`	`}`
`193`		`- ret find_pre_post_state_exprs(fcx, expr_poststate(fcx.ccx, a), id, ops,`
`194`		`- bs, cf) \|\| changed;`
	`193`	`+ ret find_pre_post_state_exprs(fcx, pres, id, ops,`
	`194`	`+ bs, cf) \|\| changed;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`fn find_pre_post_state_exprs(fcx: fn_ctxt, pres: prestate, id: node_id,`