bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix the new unsoundness

Browse source
This commit is contained in:
Ali MJ Al-Nasrawy 2023-03-05 11:54:57 +03:00
parent eea560494c
commit bfd35016e4
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_infer/src/infer/region_constraints/mod.rs
View file

@ -642,7 +642,14 @@ impl<'tcx> RegionConstraintCollector<'_, 'tcx> {
) -> ty::Region<'tcx> {
let mut ut = self.unification_table_mut(); // FIXME(rust-lang/ena#42): unnecessary mut
let root_vid = ut.find(vid).vid;
ut.probe_value(root_vid).0.unwrap_or_else(|| tcx.mk_re_var(root_vid))
let resolved = ut.probe_value(root_vid).0.unwrap_or_else(|| tcx.mk_re_var(root_vid));
// Don't resolve a variable to a region that it cannot name.
if self.var_universe(vid).can_name(self.universe(resolved)) {
resolved
} else {
tcx.mk_re_var(vid)
}
}
fn combine_map(&mut self, t: CombineMapType) -> &mut CombineMap<'tcx> {