user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change from dirty_bit_vec to clean_bit_vec

Browse source 
Otherwise the vector is initially out of sync
This commit is contained in:
Niko Matsakis 2018-01-26 20:13:51 -05:00 • committed by GitHub
parent 44b666816b
commit b57ca9d97f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_mir/borrow_check/nll/region_infer/mod.rs
View file

@ -467,12 +467,16 @@ impl<'tcx> RegionInferenceContext<'tcx> {
let mut inferred_values = self.liveness_constraints.clone();
let dependency_map = self.build_dependency_map();
// Constraints that may need to be repropagated (initially all):
let mut dirty_list: Vec<_> = (0..self.constraints.len()).collect();
let mut dirty_bit_vec = BitVector::new(dirty_list.len());
// Set to 0 for each constraint that is on the dirty list:
let mut clean_bit_vec = BitVector::new(dirty_list.len());
debug!("propagate_constraints: --------------------");
while let Some(constraint_idx) = dirty_list.pop() {
dirty_bit_vec.remove(constraint_idx);
clean_bit_vec.insert(constraint_idx);
let constraint = &self.constraints[constraint_idx];
debug!("propagate_constraints: constraint={:?}", constraint);
@ -495,7 +499,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
debug!("propagate_constraints: sup={:?}", constraint.sup);
for &dep_idx in dependency_map.get(&constraint.sup).unwrap_or(&vec![]) {
if dirty_bit_vec.insert(dep_idx) {
if clean_bit_vec.remove(dep_idx) {
dirty_list.push(dep_idx);
}
}