squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

fix the bug in region_inference where constraint origins were being overwritten

Browse source
This commit is contained in:
Michael Hewson 2017-11-09 08:39:02 -05:00
parent 7f8b003fbb
commit dcbb27aa60
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/librustc/infer/region_inference/mod.rs
View file

@ -633,11 +633,12 @@ impl<'a, 'gcx, 'tcx> RegionVarBindings<'a, 'gcx, 'tcx> {
debug!("RegionVarBindings: add_constraint({:?})", constraint);
if self.constraints.borrow_mut().insert(constraint, origin).is_none() {
self.constraints.borrow_mut().entry(constraint).or_insert_with(|| {
if self.in_snapshot() {
self.undo_log.borrow_mut().push(AddConstraint(constraint));
}
}
origin
});
}
fn add_verify(&self, verify: Verify<'tcx>) {