bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Renumber universes when canonicalizing for Chalk

Browse source 
This is required to avoid creating large numbers of universes from each
Chalk query, while still having enough universe information for lifetime
errors.
This commit is contained in:
Matthew Jasper 2022-02-09 10:18:32 +00:00
parent 1e6d38230f
commit caa10dc572
3 changed files with 165 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs
View file

@ -8,7 +8,7 @@ use crate::traits::{
PredicateObligation, SelectionError, TraitEngine,
};
use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
use rustc_middle::ty::{self, Ty};
use rustc_middle::ty::{self, Ty, TypeFoldable};
pub struct FulfillmentContext<'tcx> {
obligations: FxIndexSet<PredicateObligation<'tcx>>,
@ -91,7 +91,11 @@ impl<'tcx> TraitEngine<'tcx> for FulfillmentContext<'tcx> {
let environment = obligation.param_env.caller_bounds();
let goal = ChalkEnvironmentAndGoal { environment, goal: obligation.predicate };
let mut orig_values = OriginalQueryValues::default();
let canonical_goal = infcx.canonicalize_query(goal, &mut orig_values);
if goal.references_error() {
continue;
}
let canonical_goal = infcx.canonicalize_chalk_query(goal, &mut orig_values);
match infcx.tcx.evaluate_goal(canonical_goal) {
Ok(response) => {