nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the correct prestate for calls

Browse Source 
The prestate for calls was getting set incorrectly to the poststate for the operator
in the call. This worked before since most of the time, operator expressions are
pure. Issue 1895 shows how this breaks when the operator is a closure that has a
move-in capture clause.

(I had a several-day, multi-file patch for this that didn't work... and then it
turned out to be a one-line fix. The joys of programming.)

Closes #1895
This commit is contained in:
Tim Chevalier 2012-03-01 09:13:46 -08:00
parent 03984561d4
commit 48c763c098
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/comp/middle/tstate/states.rs
View File

@ -190,8 +190,8 @@ fn find_pre_post_state_call(fcx: fn_ctxt, pres: prestate, a: @expr,
%u exprs vs. %u ops", %u exprs vs. %u ops",
vec::len(bs), vec::len(ops)]); vec::len(bs), vec::len(ops)]);
} }
ret find_pre_post_state_exprs(fcx, expr_poststate(fcx.ccx, a), id, ops, ret find_pre_post_state_exprs(fcx, pres, id, ops,
bs, cf) || changed; bs, cf) || changed;
} }
fn find_pre_post_state_exprs(fcx: fn_ctxt, pres: prestate, id: node_id, fn find_pre_post_state_exprs(fcx: fn_ctxt, pres: prestate, id: node_id,

7
src/test/run-pass/issue-1895.rs Normal file
View File

@ -0,0 +1,7 @@
fn main() {
let x = 1;
let y = fn@[move x]() -> int {
x
}();
}