predefined opaques use List

Author: lcnr

compiler/rustc_middle/src/arena.rs

@@ -109,7 +109,6 @@ macro_rules! arena_types {
  rustc_middle::ty::EarlyBinder<'tcx, rustc_middle::ty::Ty<'tcx>>
  >,
 [] external_constraints: rustc_middle::traits::solve::ExternalConstraintsData<rustc_middle::ty::TyCtxt<'tcx>>,
-[] predefined_opaques_in_body: rustc_middle::traits::solve::PredefinedOpaquesData<rustc_middle::ty::TyCtxt<'tcx>>,
 [decode] doc_link_resolutions: rustc_hir::def::DocLinkResMap,
 [] stripped_cfg_items: rustc_hir::attrs::StrippedCfgItem,
 [] mod_child: rustc_middle::metadata::ModChild,

compiler/rustc_middle/src/traits/solve.rs

@@ -4,7 +4,7 @@ use rustc_type_ir as ir;
 pubuse rustc_type_ir::solve::*;
 
 usecrate::ty::{
-self,FallibleTypeFolder,TyCtxt,TypeFoldable,TypeFolder,TypeVisitable,TypeVisitor,
+self,FallibleTypeFolder,Ty,TyCtxt,TypeFoldable,TypeFolder,TypeVisitable,TypeVisitor,
  try_visit,
 };
 
@@ -15,16 +15,7 @@ pub type CandidateSource<'tcx> = ir::solve::CandidateSource<TyCtxt<'tcx>>;
 pubtypeCanonicalInput<'tcx,P = ty::Predicate<'tcx>> = ir::solve::CanonicalInput<TyCtxt<'tcx>,P>;
 pubtypeCanonicalResponse<'tcx> = ir::solve::CanonicalResponse<TyCtxt<'tcx>>;
 
-#[derive(Debug,PartialEq,Eq,Copy,Clone,Hash,HashStable)]
-pubstructPredefinedOpaques<'tcx>(pub(crate)Interned<'tcx,PredefinedOpaquesData<TyCtxt<'tcx>>>);
-
-impl<'tcx> std::ops::DerefforPredefinedOpaques<'tcx>{
-typeTarget = PredefinedOpaquesData<TyCtxt<'tcx>>;
-
-fnderef(&self) -> &Self::Target{
-&self.0
-}
-}
+pubtypePredefinedOpaques<'tcx> = &'tcx ty::List<(ty::OpaqueTypeKey<'tcx>,Ty<'tcx>)>;
 
 #[derive(Debug,PartialEq,Eq,Copy,Clone,Hash,HashStable)]
 pubstructExternalConstraints<'tcx>(
@@ -93,35 +84,3 @@ impl<'tcx> TypeVisitable<TyCtxt<'tcx>> for ExternalConstraints<'tcx> {
 self.normalization_nested_goals.visit_with(visitor)
 }
 }
-
-// FIXME: Having to clone `region_constraints` for folding feels bad and
-// probably isn't great wrt performance.
-//
-// Not sure how to fix this, maybe we should also intern `opaque_types` and
-// `region_constraints` here or something.
-impl<'tcx>TypeFoldable<TyCtxt<'tcx>>forPredefinedOpaques<'tcx>{
-fntry_fold_with<F:FallibleTypeFolder<TyCtxt<'tcx>>>(
-self,
-folder:&mutF,
-) -> Result<Self,F::Error>{
-Ok(FallibleTypeFolder::cx(folder).mk_predefined_opaques_in_body(PredefinedOpaquesData{
-opaque_types:self
-.opaque_types
-.iter()
-.map(|opaque| opaque.try_fold_with(folder))
-.collect::<Result<_,F::Error>>()?,
-}))
-}
-
-fnfold_with<F:TypeFolder<TyCtxt<'tcx>>>(self,folder:&mutF) -> Self{
-TypeFolder::cx(folder).mk_predefined_opaques_in_body(PredefinedOpaquesData{
-opaque_types:self.opaque_types.iter().map(|opaque| opaque.fold_with(folder)).collect(),
-})
-}
-}
-
-impl<'tcx>TypeVisitable<TyCtxt<'tcx>>forPredefinedOpaques<'tcx>{
-fnvisit_with<V:TypeVisitor<TyCtxt<'tcx>>>(&self,visitor:&mutV) -> V::Result{
-self.opaque_types.visit_with(visitor)
-}
-}

compiler/rustc_middle/src/ty/context.rs

@@ -74,8 +74,7 @@ use crate::query::{IntoQueryParam, LocalCrate, Providers, TyCtxtAt};
 usecrate::thir::Thir;
 usecrate::traits;
 usecrate::traits::solve::{
-self,CanonicalInput,ExternalConstraints,ExternalConstraintsData,PredefinedOpaques,
-PredefinedOpaquesData,QueryResult, inspect,
+self,CanonicalInput,ExternalConstraints,ExternalConstraintsData,QueryResult, inspect,
 };
 usecrate::ty::predicate::ExistentialPredicateStableCmpExtas _;
 usecrate::ty::{
@@ -116,7 +115,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 
 fnmk_predefined_opaques_in_body(
 self,
-data:PredefinedOpaquesData<Self>,
+data:&[(ty::OpaqueTypeKey<'tcx>,Ty<'tcx>)],
 ) -> Self::PredefinedOpaques{
 self.mk_predefined_opaques_in_body(data)
 }
@@ -941,7 +940,7 @@ pub struct CtxtInterners<'tcx> {
 layout:InternedSet<'tcx,LayoutData<FieldIdx,VariantIdx>>,
 adt_def:InternedSet<'tcx,AdtDefData>,
 external_constraints:InternedSet<'tcx,ExternalConstraintsData<TyCtxt<'tcx>>>,
-predefined_opaques_in_body:InternedSet<'tcx,PredefinedOpaquesData<TyCtxt<'tcx>>>,
+predefined_opaques_in_body:InternedSet<'tcx,List<(ty::OpaqueTypeKey<'tcx>,Ty<'tcx>)>>,
 fields:InternedSet<'tcx,List<FieldIdx>>,
 local_def_ids:InternedSet<'tcx,List<LocalDefId>>,
 captures:InternedSet<'tcx,List<&'tcx ty::CapturedPlace<'tcx>>>,
@@ -2748,8 +2747,6 @@ direct_interners! {
  adt_def:pub mk_adt_def_from_data(AdtDefData):AdtDef -> AdtDef<'tcx>,
  external_constraints:pub mk_external_constraints(ExternalConstraintsData<TyCtxt<'tcx>>):
 ExternalConstraints -> ExternalConstraints<'tcx>,
- predefined_opaques_in_body:pub mk_predefined_opaques_in_body(PredefinedOpaquesData<TyCtxt<'tcx>>):
-PredefinedOpaques -> PredefinedOpaques<'tcx>,
 }
 
 macro_rules! slice_interners {
@@ -2786,6 +2783,7 @@ slice_interners!(
  offset_of:pub mk_offset_of((VariantIdx,FieldIdx)),
  patterns:pub mk_patterns(Pattern<'tcx>),
  outlives:pub mk_outlives(ty::ArgOutlivesPredicate<'tcx>),
+ predefined_opaques_in_body:pub mk_predefined_opaques_in_body((ty::OpaqueTypeKey<'tcx>,Ty<'tcx>)),
 );
 
 impl<'tcx>TyCtxt<'tcx>{

compiler/rustc_middle/src/ty/structural_impls.rs

@@ -796,6 +796,7 @@ macro_rules! list_fold {
 
 list_fold!{
 &'tcx ty::List<ty::PolyExistentialPredicate<'tcx>> : mk_poly_existential_predicates,
+&'tcx ty::List<(ty::OpaqueTypeKey<'tcx>,Ty<'tcx>)>: mk_predefined_opaques_in_body,
 &'tcx ty::List<PlaceElem<'tcx>> : mk_place_elems,
 &'tcx ty::List<ty::Pattern<'tcx>> : mk_patterns,
 &'tcx ty::List<ty::ArgOutlivesPredicate<'tcx>> : mk_outlives,

compiler/rustc_next_trait_solver/src/canonical/mod.rs

@@ -25,7 +25,7 @@ use crate::delegate::SolverDelegate;
 usecrate::resolve::eager_resolve_vars;
 usecrate::solve::{
 CanonicalInput,CanonicalResponse,Certainty,ExternalConstraintsData,Goal,
-NestedNormalizationGoals,PredefinedOpaquesData,QueryInput,Response, inspect,
+NestedNormalizationGoals,QueryInput,Response, inspect,
 };
 
 pubmod canonicalizer;
@@ -53,7 +53,7 @@ impl<I: Interner, T> ResponseT<I> for inspect::State<I, T> {
 pub(super)fncanonicalize_goal<D,I>(
 delegate:&D,
 goal:Goal<I,I::Predicate>,
-opaque_types:Vec<(ty::OpaqueTypeKey<I>,I::Ty)>,
+opaque_types:&[(ty::OpaqueTypeKey<I>,I::Ty)],
 ) -> (Vec<I::GenericArg>,CanonicalInput<I,I::Predicate>)
 where
 D:SolverDelegate<Interner = I>,
@@ -65,9 +65,7 @@ where
 &mut orig_values,
 QueryInput{
  goal,
-predefined_opaques_in_body: delegate
-.cx()
-.mk_predefined_opaques_in_body(PredefinedOpaquesData{ opaque_types }),
+predefined_opaques_in_body: delegate.cx().mk_predefined_opaques_in_body(opaque_types),
 },
 );
 let query_input = ty::CanonicalQueryInput{ canonical,typing_mode: delegate.typing_mode()};

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

@@ -357,7 +357,7 @@ where
 f:implFnOnce(&mutEvalCtxt<'_,D>,Goal<I,I::Predicate>) -> R,
 ) -> R{
 let(ref delegate, input, var_values) = D::build_with_canonical(cx,&canonical_input);
-for&(key, ty)in&input.predefined_opaques_in_body.opaque_types{
+for(key, ty)in input.predefined_opaques_in_body.iter(){
 let prev = delegate.register_hidden_type_in_storage(key, ty,I::Span::dummy());
 // It may be possible that two entries in the opaque type storage end up
 // with the same key after resolving contained inference variables.
@@ -467,7 +467,7 @@ where
 let opaque_types = self.delegate.clone_opaque_types_lookup_table();
 let(goal, opaque_types) = eager_resolve_vars(self.delegate,(goal, opaque_types));
 
-let(orig_values, canonical_goal) = canonicalize_goal(self.delegate, goal, opaque_types);
+let(orig_values, canonical_goal) = canonicalize_goal(self.delegate, goal,&opaque_types);
 let canonical_result = self.search_graph.evaluate_goal(
 self.cx(),
  canonical_goal,
@@ -548,7 +548,6 @@ where
 .canonical
 .value
 .predefined_opaques_in_body
-.opaque_types
 .len(),
  stalled_vars,
  sub_roots,
@@ -1557,7 +1556,7 @@ pub(super) fn evaluate_root_goal_for_proof_tree<D: SolverDelegate<Interner = I>,
 let opaque_types = delegate.clone_opaque_types_lookup_table();
 let(goal, opaque_types) = eager_resolve_vars(delegate,(goal, opaque_types));
 
-let(orig_values, canonical_goal) = canonicalize_goal(delegate, goal, opaque_types);
+let(orig_values, canonical_goal) = canonicalize_goal(delegate, goal,&opaque_types);
 
 let(canonical_result, final_revision) =
  delegate.cx().evaluate_root_goal_for_proof_tree_raw(canonical_goal);

compiler/rustc_type_ir/src/interner.rs

@@ -11,9 +11,7 @@ use crate::inherent::*;
 usecrate::ir_print::IrPrint;
 usecrate::lang_items::{SolverAdtLangItem,SolverLangItem,SolverTraitLangItem};
 usecrate::relate::Relate;
-usecrate::solve::{
-CanonicalInput,ExternalConstraintsData,PredefinedOpaquesData,QueryResult, inspect,
-};
+usecrate::solve::{CanonicalInput,ExternalConstraintsData,QueryResult, inspect};
 usecrate::visit::{Flags,TypeVisitable};
 usecrate::{selfas ty,CanonicalParamEnvCacheEntry, search_graph};
 
@@ -70,10 +68,10 @@ pub trait Interner:
  + Hash
  + Eq
  + TypeFoldable<Self>
- + Deref<Target = PredefinedOpaquesData<Self>>;
+ + SliceLike<Item = (ty::OpaqueTypeKey<Self>,Self::Ty)>;
 fnmk_predefined_opaques_in_body(
 self,
-data:PredefinedOpaquesData<Self>,
+data:&[(ty::OpaqueTypeKey<Self>,Self::Ty)],
 ) -> Self::PredefinedOpaques;
 
 typeLocalDefIds:Copy

compiler/rustc_type_ir/src/solve/mod.rs

@@ -109,19 +109,6 @@ pub struct QueryInput<I: Interner, P> {
 
 impl<I:Interner,P:Eq>EqforQueryInput<I,P>{}
 
-/// Opaques that are defined in the inference context before a query is called.
-#[derive_where(Clone,Hash,PartialEq,Debug,Default;I:Interner)]
-#[derive(TypeVisitable_Generic,TypeFoldable_Generic)]
-#[cfg_attr(
- feature = "nightly",
- derive(Decodable_NoContext,Encodable_NoContext,HashStable_NoContext)
-)]
-pubstructPredefinedOpaquesData<I:Interner>{
-pubopaque_types:Vec<(ty::OpaqueTypeKey<I>,I::Ty)>,
-}
-
-impl<I:Interner>EqforPredefinedOpaquesData<I>{}
-
 /// Possible ways the given goal can be proven.
 #[derive_where(Clone,Copy,Hash,PartialEq,Debug;I:Interner)]
 pubenumCandidateSource<I:Interner>{