bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Do process_registered_region_obligations in a loop

Browse source
This commit is contained in:
Michael Goulet 2024-01-30 21:49:55 +00:00
parent 0e16885abd
commit 7576b77e50
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
compiler/rustc_infer/src/infer/outlives/obligations.rs
View file

@ -153,22 +153,28 @@ impl<'tcx> InferCtxt<'tcx> {
.try_collect() .try_collect()
.map_err(|e| (e, SubregionOrigin::AscribeUserTypeProvePredicate(DUMMY_SP)))?; .map_err(|e| (e, SubregionOrigin::AscribeUserTypeProvePredicate(DUMMY_SP)))?;
let my_region_obligations = self.take_registered_region_obligations(); // Must loop since the process of normalizing may itself register region obligations.
loop {
let my_region_obligations = self.take_registered_region_obligations();
if my_region_obligations.is_empty() {
break;
}
for RegionObligation { sup_type, sub_region, origin } in my_region_obligations { for RegionObligation { sup_type, sub_region, origin } in my_region_obligations {
let sup_type = let sup_type = deeply_normalize_ty(sup_type, origin.clone())
deeply_normalize_ty(sup_type, origin.clone()).map_err(|e| (e, origin.clone()))?; .map_err(|e| (e, origin.clone()))?;
debug!(?sup_type, ?sub_region, ?origin); debug!(?sup_type, ?sub_region, ?origin);
let outlives = &mut TypeOutlives::new( let outlives = &mut TypeOutlives::new(
self, self,
self.tcx, self.tcx,
outlives_env.region_bound_pairs(), outlives_env.region_bound_pairs(),
None, None,
&normalized_caller_bounds, &normalized_caller_bounds,
); );
let category = origin.to_constraint_category(); let category = origin.to_constraint_category();
outlives.type_must_outlive(origin, sup_type, sub_region, category); outlives.type_must_outlive(origin, sup_type, sub_region, category);
}
} }
Ok(()) Ok(())