cache the world

lcnr · lcnr · commit 0dac974719ee · 2024-09-25T11:13:23.000+02:00
diff --git a/compiler/rustc_infer/src/infer/relate/type_relating.rs b/compiler/rustc_infer/src/infer/relate/type_relating.rs
@@ -1,3 +1,4 @@
+use rustc_data_structures::fx::FxHashSet;
 use rustc_middle::traits::solve::Goal;
 use rustc_middle::ty::relate::{
     Relate, RelateResult, TypeRelation, relate_args_invariantly, relate_args_with_variances,
@@ -16,6 +17,7 @@ pub struct TypeRelating<'combine, 'a, 'tcx> {
     fields: &'combine mut CombineFields<'a, 'tcx>,
     structurally_relate_aliases: StructurallyRelateAliases,
     ambient_variance: ty::Variance,
+    cache: FxHashSet<(ty::Variance, Ty<'tcx>, Ty<'tcx>)>,
 }
 
 impl<'combine, 'infcx, 'tcx> TypeRelating<'combine, 'infcx, 'tcx> {
@@ -24,7 +26,7 @@ impl<'combine, 'infcx, 'tcx> TypeRelating<'combine, 'infcx, 'tcx> {
         structurally_relate_aliases: StructurallyRelateAliases,
         ambient_variance: ty::Variance,
     ) -> TypeRelating<'combine, 'infcx, 'tcx> {
-        TypeRelating { fields: f, structurally_relate_aliases, ambient_variance }
+        TypeRelating { fields: f, structurally_relate_aliases, ambient_variance, cache: Default::default() }
     }
 }
 
@@ -74,9 +76,14 @@ impl<'tcx> TypeRelation<TyCtxt<'tcx>> for TypeRelating<'_, '_, 'tcx> {
             return Ok(a);
         }
 
+        
         let infcx = self.fields.infcx;
         let a = infcx.shallow_resolve(a);
         let b = infcx.shallow_resolve(b);
+        
+        if self.cache.contains(&(self.ambient_variance, a, b)) {
+            return Ok(a);
+        }
 
         match (a.kind(), b.kind()) {
             (&ty::Infer(TyVar(a_id)), &ty::Infer(TyVar(b_id))) => {
@@ -160,6 +167,8 @@ impl<'tcx> TypeRelation<TyCtxt<'tcx>> for TypeRelating<'_, '_, 'tcx> {
             }
         }
 
+        assert!(self.cache.insert((self.ambient_variance, a, b)));
+
         Ok(a)
     }
 
diff --git a/compiler/rustc_infer/src/infer/resolve.rs b/compiler/rustc_infer/src/infer/resolve.rs
@@ -1,3 +1,4 @@
+use rustc_data_structures::fx::FxHashMap;
 use rustc_middle::bug;
 use rustc_middle::ty::fold::{FallibleTypeFolder, TypeFolder, TypeSuperFoldable};
 use rustc_middle::ty::visit::TypeVisitableExt;
@@ -15,12 +16,13 @@ use super::{FixupError, FixupResult, InferCtxt};
 /// points for correctness.
 pub struct OpportunisticVarResolver<'a, 'tcx> {
     infcx: &'a InferCtxt<'tcx>,
+    cache: FxHashMap<Ty<'tcx>, Ty<'tcx>>,
 }
 
 impl<'a, 'tcx> OpportunisticVarResolver<'a, 'tcx> {
     #[inline]
     pub fn new(infcx: &'a InferCtxt<'tcx>) -> Self {
-        OpportunisticVarResolver { infcx }
+        OpportunisticVarResolver { infcx, cache: Default::default() }
     }
 }
 
@@ -31,12 +33,19 @@ impl<'a, 'tcx> TypeFolder<TyCtxt<'tcx>> for OpportunisticVarResolver<'a, 'tcx> {
 
     #[inline]
     fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
-        if !t.has_non_region_infer() {
+        if let Some(&ty) = self.cache.get(&t) {
+            return ty;
+        }
+        
+        let res = if !t.has_non_region_infer() {
             t // micro-optimize -- if there is nothing in this type that this fold affects...
         } else {
             let t = self.infcx.shallow_resolve(t);
             t.super_fold_with(self)
-        }
+        };
+
+        assert!(self.cache.insert(t, res).is_none());
+        res
     }
 
     fn fold_const(&mut self, ct: Const<'tcx>) -> Const<'tcx> {
diff --git a/compiler/rustc_middle/src/ty/fold.rs b/compiler/rustc_middle/src/ty/fold.rs
@@ -1,4 +1,4 @@
-use rustc_data_structures::fx::FxIndexMap;
+use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
 use rustc_hir::def_id::DefId;
 pub use rustc_type_ir::fold::{
     FallibleTypeFolder, TypeFoldable, TypeFolder, TypeSuperFoldable, shift_region, shift_vars,
@@ -164,11 +164,13 @@ struct BoundVarReplacer<'tcx, D> {
     current_index: ty::DebruijnIndex,
 
     delegate: D,
+
+    cache: FxHashMap<(ty::DebruijnIndex, Ty<'tcx>), Ty<'tcx>>,
 }
 
 impl<'tcx, D: BoundVarReplacerDelegate<'tcx>> BoundVarReplacer<'tcx, D> {
     fn new(tcx: TyCtxt<'tcx>, delegate: D) -> Self {
-        BoundVarReplacer { tcx, current_index: ty::INNERMOST, delegate }
+        BoundVarReplacer { tcx, current_index: ty::INNERMOST, delegate, cache: Default::default() }
     }
 }
 
@@ -191,15 +193,22 @@ where
     }
 
     fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
-        match *t.kind() {
+        if let Some(&ty) = self.cache.get(&(self.current_index, t)) {
+            return ty;
+        }
+
+        let res = match *t.kind() {
             ty::Bound(debruijn, bound_ty) if debruijn == self.current_index => {
                 let ty = self.delegate.replace_ty(bound_ty);
                 debug_assert!(!ty.has_vars_bound_above(ty::INNERMOST));
                 ty::fold::shift_vars(self.tcx, ty, self.current_index.as_u32())
             }
             _ if t.has_vars_bound_at_or_above(self.current_index) => t.super_fold_with(self),
             _ => t,
-        }
+        };
+
+        assert!(self.cache.insert((self.current_index, t), res).is_none());
+        res
     }
 
     fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
diff --git a/compiler/rustc_next_trait_solver/src/resolve.rs b/compiler/rustc_next_trait_solver/src/resolve.rs
@@ -2,6 +2,7 @@ use rustc_type_ir::fold::{TypeFoldable, TypeFolder, TypeSuperFoldable};
 use rustc_type_ir::inherent::*;
 use rustc_type_ir::visit::TypeVisitableExt;
 use rustc_type_ir::{self as ty, InferCtxtLike, Interner};
+use rustc_type_ir::data_structures::HashMap;
 
 use crate::delegate::SolverDelegate;
 
@@ -15,11 +16,12 @@ where
     I: Interner,
 {
     delegate: &'a D,
+    cache: HashMap<I::Ty, I::Ty>,
 }
 
 impl<'a, D: SolverDelegate> EagerResolver<'a, D> {
     pub fn new(delegate: &'a D) -> Self {
-        EagerResolver { delegate }
+        EagerResolver { delegate, cache: Default::default() }
     }
 }
 
@@ -29,7 +31,11 @@ impl<D: SolverDelegate<Interner = I>, I: Interner> TypeFolder<I> for EagerResolv
     }
 
     fn fold_ty(&mut self, t: I::Ty) -> I::Ty {
-        match t.kind() {
+        if let Some(&ty) = self.cache.get(&t) {
+            return ty;
+        }
+
+        let res = match t.kind() {
             ty::Infer(ty::TyVar(vid)) => {
                 let resolved = self.delegate.opportunistic_resolve_ty_var(vid);
                 if t != resolved && resolved.has_infer() {
@@ -47,7 +53,10 @@ impl<D: SolverDelegate<Interner = I>, I: Interner> TypeFolder<I> for EagerResolv
                     t
                 }
             }
-        }
+        };
+
+        assert!(self.cache.insert(t, res).is_none());
+        res
     }
 
     fn fold_region(&mut self, r: I::Region) -> I::Region {
diff --git a/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs b/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs
@@ -3,7 +3,7 @@ use std::ops::ControlFlow;
 use derive_where::derive_where;
 #[cfg(feature = "nightly")]
 use rustc_macros::{HashStable_NoContext, TyDecodable, TyEncodable};
-use rustc_type_ir::data_structures::ensure_sufficient_stack;
+use rustc_type_ir::data_structures::{HashMap, HashSet, ensure_sufficient_stack};
 use rustc_type_ir::fold::{TypeFoldable, TypeFolder, TypeSuperFoldable};
 use rustc_type_ir::inherent::*;
 use rustc_type_ir::relate::Relate;
@@ -587,7 +587,7 @@ where
     pub(super) fn add_normalizes_to_goal(&mut self, mut goal: Goal<I, ty::NormalizesTo<I>>) {
         goal.predicate = goal
             .predicate
-            .fold_with(&mut ReplaceAliasWithInfer { ecx: self, param_env: goal.param_env });
+            .fold_with(&mut ReplaceAliasWithInfer::new(self, goal.param_env));
         self.inspect.add_normalizes_to_goal(self.delegate, self.max_input_universe, goal);
         self.nested_goals.normalizes_to_goals.push(goal);
     }
@@ -596,7 +596,7 @@ where
     pub(super) fn add_goal(&mut self, source: GoalSource, mut goal: Goal<I, I::Predicate>) {
         goal.predicate = goal
             .predicate
-            .fold_with(&mut ReplaceAliasWithInfer { ecx: self, param_env: goal.param_env });
+            .fold_with(&mut ReplaceAliasWithInfer::new(self, goal.param_env));
         self.inspect.add_goal(self.delegate, self.max_input_universe, source, goal);
         self.nested_goals.goals.push((source, goal));
     }
@@ -660,6 +660,7 @@ where
             term: I::Term,
             universe_of_term: ty::UniverseIndex,
             delegate: &'a D,
+            cache: HashSet<I::Ty>,
         }
 
         impl<D: SolverDelegate<Interner = I>, I: Interner> ContainsTermOrNotNameable<'_, D, I> {
@@ -677,6 +678,10 @@ where
         {
             type Result = ControlFlow<()>;
             fn visit_ty(&mut self, t: I::Ty) -> Self::Result {
+                if self.cache.contains(&t) {
+                    return ControlFlow::Continue(());
+                }
+                
                 match t.kind() {
                     ty::Infer(ty::TyVar(vid)) => {
                         if let ty::TermKind::Ty(term) = self.term.kind() {
@@ -689,17 +694,18 @@ where
                             }
                         }
 
-                        self.check_nameable(self.delegate.universe_of_ty(vid).unwrap())
+                        self.check_nameable(self.delegate.universe_of_ty(vid).unwrap())?;
                     }
-                    ty::Placeholder(p) => self.check_nameable(p.universe()),
+                    ty::Placeholder(p) => self.check_nameable(p.universe())?,
                     _ => {
                         if t.has_non_region_infer() || t.has_placeholders() {
-                            t.super_visit_with(self)
-                        } else {
-                            ControlFlow::Continue(())
+                            t.super_visit_with(self)?
                         }
                     }
                 }
+
+                assert!(self.cache.insert(t));
+                ControlFlow::Continue(())
             }
 
             fn visit_const(&mut self, c: I::Const) -> Self::Result {
@@ -734,6 +740,7 @@ where
             delegate: self.delegate,
             universe_of_term,
             term: goal.predicate.term,
+            cache: Default::default(),
         };
         goal.predicate.alias.visit_with(&mut visitor).is_continue()
             && goal.param_env.visit_with(&mut visitor).is_continue()
@@ -1021,6 +1028,17 @@ where
 {
     ecx: &'me mut EvalCtxt<'a, D>,
     param_env: I::ParamEnv,
+    cache: HashMap<I::Ty, I::Ty>,
+}
+
+impl<'me, 'a, D, I> ReplaceAliasWithInfer<'me, 'a, D, I>
+where
+    D: SolverDelegate<Interner = I>,
+    I: Interner,
+    {
+    fn new(ecx: &'me mut EvalCtxt<'a, D>, param_env: I::ParamEnv) -> Self {
+        ReplaceAliasWithInfer { ecx, param_env, cache: Default::default() }
+    }
 }
 
 impl<D, I> TypeFolder<I> for ReplaceAliasWithInfer<'_, '_, D, I>
@@ -1033,7 +1051,11 @@ where
     }
 
     fn fold_ty(&mut self, ty: I::Ty) -> I::Ty {
-        match ty.kind() {
+        if let Some(&entry) = self.cache.get(&ty) {
+            return entry;
+        }
+
+        let res = match ty.kind() {
             ty::Alias(..) if !ty.has_escaping_bound_vars() => {
                 let infer_ty = self.ecx.next_ty_infer();
                 let normalizes_to = ty::PredicateKind::AliasRelate(
@@ -1048,7 +1070,10 @@ where
                 infer_ty
             }
             _ => ty.super_fold_with(self),
-        }
+        };
+
+        assert!(self.cache.insert(ty, res).is_none());
+        res
     }
 
     fn fold_const(&mut self, ct: I::Const) -> I::Const {
diff --git a/tests/ui/traits/next-solver/overflow/coherence-alias-hang.rs b/tests/ui/traits/next-solver/overflow/coherence-alias-hang.rs
@@ -1,6 +1,9 @@
 //@ check-pass
-//@ revisions: current next
-//[next]@ compile-flags: -Znext-solver
+//@ revisions: ai_current ai_next ia_current ia_next ii_current ii_next
+//@[ai_next] compile-flags: -Znext-solver
+//@[ia_next] compile-flags: -Znext-solver
+//@[ii_next] compile-flags: -Znext-solver
+// check-pass
 
 // Regression test for nalgebra hang <https://github.com/rust-lang/rust/issues/130056>.
 
@@ -15,7 +18,12 @@ trait Trait {
     type Assoc: ?Sized;
 }
 impl<T: ?Sized + Trait> Trait for W<T, T> {
+    #[cfg(any(ai_current, ai_next))]
     type Assoc = W<T::Assoc, Id<T::Assoc>>;
+    #[cfg(any(ia_current, ia_next))]
+    type Assoc = W<Id<T::Assoc>, T::Assoc>;
+    #[cfg(any(ii_current, ii_next))]
+    type Assoc = W<Id<T::Assoc>, Id<T::Assoc>>;
 }
 
 trait Overlap<T: ?Sized> {}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use rustc_data_structures::fx::FxHashSet;`
`1`	`2`	`use rustc_middle::traits::solve::Goal;`
`2`	`3`	`use rustc_middle::ty::relate::{`
`3`	`4`	`Relate, RelateResult, TypeRelation, relate_args_invariantly, relate_args_with_variances,`
`@@ -16,6 +17,7 @@ pub struct TypeRelating<'combine, 'a, 'tcx> {`
`16`	`17`	`fields: &'combine mut CombineFields<'a, 'tcx>,`
`17`	`18`	`structurally_relate_aliases: StructurallyRelateAliases,`
`18`	`19`	`ambient_variance: ty::Variance,`
	`20`	`+ cache: FxHashSet<(ty::Variance, Ty<'tcx>, Ty<'tcx>)>,`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`impl<'combine, 'infcx, 'tcx> TypeRelating<'combine, 'infcx, 'tcx> {`
`@@ -24,7 +26,7 @@ impl<'combine, 'infcx, 'tcx> TypeRelating<'combine, 'infcx, 'tcx> {`
`24`	`26`	`structurally_relate_aliases: StructurallyRelateAliases,`
`25`	`27`	`ambient_variance: ty::Variance,`
`26`	`28`	`) -> TypeRelating<'combine, 'infcx, 'tcx> {`
`27`		`- TypeRelating { fields: f, structurally_relate_aliases, ambient_variance }`
	`29`	`+ TypeRelating { fields: f, structurally_relate_aliases, ambient_variance, cache: Default::default() }`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`
`@@ -74,9 +76,14 @@ impl<'tcx> TypeRelation<TyCtxt<'tcx>> for TypeRelating<'_, '_, 'tcx> {`
`74`	`76`	`return Ok(a);`
`75`	`77`	`}`
`76`	`78`
	`79`	`+`
`77`	`80`	`let infcx = self.fields.infcx;`
`78`	`81`	`let a = infcx.shallow_resolve(a);`
`79`	`82`	`let b = infcx.shallow_resolve(b);`
	`83`	`+`
	`84`	`+ if self.cache.contains(&(self.ambient_variance, a, b)) {`
	`85`	`+ return Ok(a);`
	`86`	`+ }`
`80`	`87`
`81`	`88`	`match (a.kind(), b.kind()) {`
`82`	`89`	`(&ty::Infer(TyVar(a_id)), &ty::Infer(TyVar(b_id))) => {`
`@@ -160,6 +167,8 @@ impl<'tcx> TypeRelation<TyCtxt<'tcx>> for TypeRelating<'_, '_, 'tcx> {`
`160`	`167`	`}`
`161`	`168`	`}`
`162`	`169`
	`170`	`+ assert!(self.cache.insert((self.ambient_variance, a, b)));`
	`171`	`+`
`163`	`172`	`Ok(a)`
`164`	`173`	`}`
`165`	`174`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ use rustc_type_ir::fold::{TypeFoldable, TypeFolder, TypeSuperFoldable};`
`2`	`2`	`use rustc_type_ir::inherent::*;`
`3`	`3`	`use rustc_type_ir::visit::TypeVisitableExt;`
`4`	`4`	`use rustc_type_ir::{self as ty, InferCtxtLike, Interner};`
	`5`	`+use rustc_type_ir::data_structures::HashMap;`
`5`	`6`
`6`	`7`	`use crate::delegate::SolverDelegate;`
`7`	`8`
`@@ -15,11 +16,12 @@ where`
`15`	`16`	`I: Interner,`
`16`	`17`	`{`
`17`	`18`	`delegate: &'a D,`
	`19`	`+ cache: HashMap<I::Ty, I::Ty>,`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`impl<'a, D: SolverDelegate> EagerResolver<'a, D> {`
`21`	`23`	`pub fn new(delegate: &'a D) -> Self {`
`22`		`- EagerResolver { delegate }`
	`24`	`+ EagerResolver { delegate, cache: Default::default() }`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`
`@@ -29,7 +31,11 @@ impl<D: SolverDelegate<Interner = I>, I: Interner> TypeFolder<I> for EagerResolv`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`fn fold_ty(&mut self, t: I::Ty) -> I::Ty {`
`32`		`- match t.kind() {`
	`34`	`+ if let Some(&ty) = self.cache.get(&t) {`
	`35`	`+ return ty;`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ let res = match t.kind() {`
`33`	`39`	`ty::Infer(ty::TyVar(vid)) => {`
`34`	`40`	`let resolved = self.delegate.opportunistic_resolve_ty_var(vid);`
`35`	`41`	`if t != resolved && resolved.has_infer() {`
`@@ -47,7 +53,10 @@ impl<D: SolverDelegate<Interner = I>, I: Interner> TypeFolder<I> for EagerResolv`
`47`	`53`	`t`
`48`	`54`	`}`
`49`	`55`	`}`
`50`		`- }`
	`56`	`+ };`
	`57`	`+`
	`58`	`+ assert!(self.cache.insert(t, res).is_none());`
	`59`	`+ res`
`51`	`60`	`}`
`52`	`61`
`53`	`62`	`fn fold_region(&mut self, r: I::Region) -> I::Region {`