mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look for storage conflicts before terminator effect

Browse Source
This commit is contained in:
Dylan MacKenzie 2020-05-08 10:20:51 -07:00
parent d8e0807052
commit def207e262
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/librustc_mir/transform/generator.rs
View File

@ -615,7 +615,9 @@ fn compute_storage_conflicts(
continue;
}
for (statement_index, _) in data.statements.iter().enumerate() {
// Observe the dataflow state *before* all possible locations (statement or terminator) in
// each basic block...
for statement_index in 0..=data.statements.len() {
let loc = Location { block, statement_index };
trace!("record conflicts at {:?}", loc);
init.seek_before_primary_effect(loc);
@ -623,10 +625,9 @@ fn compute_storage_conflicts(
record_conflicts_at_curr_loc(&mut local_conflicts, &init, &borrowed);
}
// We need to look for conflicts at the end of the block as well, otherwise we would not
// observe the dataflow state after the terminator effect is applied. As long as neither
// `init` nor `borrowed` has a "before" effect, we will observe all possible dataflow
// states here or in the loop above.
// ...and then observe the state *after* the terminator effect is applied. As long as
// neither `init` nor `borrowed` has a "before" effect, we will observe all possible
// dataflow states here or in the loop above.
trace!("record conflicts at end of {:?}", block);
init.seek_to_block_end(block);
borrowed.seek_to_block_end(block);