DropckOutlives to rustc_middle

Author: lcnr

compiler/rustc_borrowck/src/type_check/liveness/trace.rs

@@ -11,8 +11,7 @@ use rustc_mir_dataflow::impls::MaybeInitializedPlaces;
 use rustc_mir_dataflow::move_paths::{HasMoveData,MoveData,MovePathIndex};
 use rustc_mir_dataflow::points::{DenseLocationMap,PointIndex};
 use rustc_span::DUMMY_SP;
-use rustc_trait_selection::traits::query::type_op::outlives::DropckOutlives;
-use rustc_trait_selection::traits::query::type_op::{TypeOp,TypeOpOutput};
+use rustc_trait_selection::traits::query::type_op::{DropckOutlives,TypeOp,TypeOpOutput};
 use tracing::debug;
 
 usecrate::location::RichLocation;
@@ -632,7 +631,7 @@ impl<'tcx> LivenessContext<'_, '_, '_, 'tcx> {
 
 match typeck
 .param_env
-.and(DropckOutlives::new(dropped_ty))
+.and(DropckOutlives{dropped_ty})
 .fully_perform(typeck.infcx,DUMMY_SP)
 {
 Ok(TypeOpOutput{ output, constraints, .. }) => {

compiler/rustc_middle/src/query/mod.rs

@@ -65,10 +65,11 @@ use crate::query::plumbing::{
 CyclePlaceholder,DynamicQuery, query_ensure, query_ensure_error_guaranteed, query_get_at,
 };
 usecrate::traits::query::{
-CanonicalAliasGoal,CanonicalImpliedOutlivesBoundsGoal,CanonicalPredicateGoal,
-CanonicalTyGoal,CanonicalTypeOpAscribeUserTypeGoal,CanonicalTypeOpNormalizeGoal,
-CanonicalTypeOpProvePredicateGoal,DropckConstraint,DropckOutlivesResult,
-MethodAutoderefStepsResult,NoSolution,NormalizationResult,OutlivesBound,
+CanonicalAliasGoal,CanonicalDropckOutlivesGoal,CanonicalImpliedOutlivesBoundsGoal,
+CanonicalPredicateGoal,CanonicalTyGoal,CanonicalTypeOpAscribeUserTypeGoal,
+CanonicalTypeOpNormalizeGoal,CanonicalTypeOpProvePredicateGoal,DropckConstraint,
+DropckOutlivesResult,MethodAutoderefStepsResult,NoSolution,NormalizationResult,
+OutlivesBound,
 };
 usecrate::traits::{
 CodegenObligationError,DynCompatibilityViolation,EvaluationResult,ImplSource,
@@ -2069,12 +2070,12 @@ rustc_queries! {
 /// Do not call this query directly:
 /// invoke `DropckOutlives::new(dropped_ty)).fully_perform(typeck.infcx)` instead.
  query dropck_outlives(
- goal:CanonicalTyGoal<'tcx>
+ goal:CanonicalDropckOutlivesGoal<'tcx>
 ) -> Result<
 &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx,DropckOutlivesResult<'tcx>>>,
 NoSolution,
  > {
- desc {"computing dropck types for `{}`", goal.value.value }
+ desc {"computing dropck types for `{}`", goal.value.value.dropped_ty}
 }
 
 /// Do not call this query directly: invoke `infcx.predicate_may_hold()` or

compiler/rustc_middle/src/traits/query.rs

@@ -51,6 +51,11 @@ pub mod type_op {
 pubstructImpliedOutlivesBounds<'tcx>{
 pubty:Ty<'tcx>,
 }
+
+#[derive(Copy,Clone,Debug,Hash,PartialEq,Eq,HashStable,TypeFoldable,TypeVisitable)]
+pubstructDropckOutlives<'tcx>{
+pubdropped_ty:Ty<'tcx>,
+}
 }
 
 pubtypeCanonicalAliasGoal<'tcx> = Canonical<'tcx, ty::ParamEnvAnd<'tcx, ty::AliasTy<'tcx>>>;
@@ -76,6 +81,9 @@ pub type CanonicalTypeOpNormalizeGoal<'tcx, T> =
 pubtypeCanonicalImpliedOutlivesBoundsGoal<'tcx> =
 Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::ImpliedOutlivesBounds<'tcx>>>;
 
+pubtypeCanonicalDropckOutlivesGoal<'tcx> =
+Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::DropckOutlives<'tcx>>>;
+
 #[derive(Clone,Debug,Default,HashStable,TypeFoldable,TypeVisitable)]
 pubstructDropckOutlivesResult<'tcx>{
 pubkinds:Vec<GenericArg<'tcx>>,

compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs

@@ -1,4 +1,5 @@
 use rustc_data_structures::fx::FxHashSet;
+use rustc_infer::traits::query::type_op::DropckOutlives;
 use rustc_middle::traits::query::{DropckConstraint,DropckOutlivesResult};
 use rustc_middle::ty::{self,EarlyBinder,ParamEnvAnd,Ty,TyCtxt};
 use rustc_span::{DUMMY_SP,Span};
@@ -88,18 +89,18 @@ pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
 
 pubfncompute_dropck_outlives_inner<'tcx>(
 ocx:&ObligationCtxt<'_,'tcx>,
-goal:ParamEnvAnd<'tcx,Ty<'tcx>>,
+goal:ParamEnvAnd<'tcx,DropckOutlives<'tcx>>,
 ) -> Result<DropckOutlivesResult<'tcx>,NoSolution>{
 let tcx = ocx.infcx.tcx;
-letParamEnvAnd{ param_env,value:for_ty} = goal;
+letParamEnvAnd{ param_env,value:DropckOutlives{ dropped_ty }} = goal;
 
 letmut result = DropckOutlivesResult{kinds:vec![],overflows:vec![]};
 
 // A stack of types left to process. Each round, we pop
 // something from the stack and invoke
 // `dtorck_constraint_for_ty_inner`. This may produce new types that
 // have to be pushed on the stack. This continues until we have explored
-// all the reachable types from the type `for_ty`.
+// all the reachable types from the type `dropped_ty`.
 //
 // Example: Imagine that we have the following code:
 //
@@ -129,7 +130,7 @@ pub fn compute_dropck_outlives_inner<'tcx>(
 // lead to us trying to push `A` a second time -- to prevent
 // infinite recursion, we notice that `A` was already pushed
 // once and stop.
-letmut ty_stack = vec![(for_ty,0)];
+letmut ty_stack = vec![(dropped_ty,0)];
 
 // Set used to detect infinite recursion.
 letmut ty_set = FxHashSet::default();

compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs

@@ -1,23 +1,12 @@
-use rustc_macros::{HashStable,TypeFoldable,TypeVisitable};
 use rustc_middle::traits::query::{DropckOutlivesResult,NoSolution};
-use rustc_middle::ty::{ParamEnvAnd,Ty,TyCtxt};
+use rustc_middle::ty::{ParamEnvAnd,TyCtxt};
 
 usecrate::infer::canonical::{Canonical,CanonicalQueryResponse};
 usecrate::traits::ObligationCtxt;
 usecrate::traits::query::dropck_outlives::{
  compute_dropck_outlives_inner, trivial_dropck_outlives,
 };
-
-#[derive(Copy,Clone,Debug,HashStable,TypeFoldable,TypeVisitable)]
-pubstructDropckOutlives<'tcx>{
-dropped_ty:Ty<'tcx>,
-}
-
-impl<'tcx>DropckOutlives<'tcx>{
-pubfnnew(dropped_ty:Ty<'tcx>) -> Self{
-DropckOutlives{ dropped_ty }
-}
-}
+usecrate::traits::query::type_op::DropckOutlives;
 
 impl<'tcx>super::QueryTypeOp<'tcx>forDropckOutlives<'tcx>{
 typeQueryResponse = DropckOutlivesResult<'tcx>;
@@ -33,21 +22,13 @@ impl<'tcx> super::QueryTypeOp<'tcx> for DropckOutlives<'tcx> {
 tcx:TyCtxt<'tcx>,
 canonicalized:Canonical<'tcx,ParamEnvAnd<'tcx,Self>>,
 ) -> Result<CanonicalQueryResponse<'tcx,Self::QueryResponse>,NoSolution>{
-// FIXME convert to the type expected by the `dropck_outlives`
-// query. This should eventually be fixed by changing the
-// *underlying query*.
-let canonicalized = canonicalized.unchecked_map(|ParamEnvAnd{ param_env, value }| {
-letDropckOutlives{ dropped_ty } = value;
- param_env.and(dropped_ty)
-});
-
  tcx.dropck_outlives(canonicalized)
 }
 
 fnperform_locally_with_next_solver(
 ocx:&ObligationCtxt<'_,'tcx>,
 key:ParamEnvAnd<'tcx,Self>,
 ) -> Result<Self::QueryResponse,NoSolution>{
-compute_dropck_outlives_inner(ocx, key.param_env.and(key.value.dropped_ty))
+compute_dropck_outlives_inner(ocx, key.param_env.and(key.value))
 }
 }

compiler/rustc_traits/src/dropck_outlives.rs

@@ -10,7 +10,7 @@ use rustc_trait_selection::infer::InferCtxtBuilderExt;
 use rustc_trait_selection::traits::query::dropck_outlives::{
  compute_dropck_outlives_inner, dtorck_constraint_for_ty_inner,
 };
-use rustc_trait_selection::traits::query::{CanonicalTyGoal,NoSolution};
+use rustc_trait_selection::traits::query::{CanonicalDropckOutlivesGoal,NoSolution};
 use tracing::debug;
 
 pub(crate)fnprovide(p:&mutProviders){
@@ -19,7 +19,7 @@ pub(crate) fn provide(p: &mut Providers) {
 
 fndropck_outlives<'tcx>(
 tcx:TyCtxt<'tcx>,
-canonical_goal:CanonicalTyGoal<'tcx>,
+canonical_goal:CanonicalDropckOutlivesGoal<'tcx>,
 ) -> Result<&'tcxCanonical<'tcx,QueryResponse<'tcx,DropckOutlivesResult<'tcx>>>,NoSolution>{
 debug!("dropck_outlives(goal={:#?})", canonical_goal);