bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

make dropck_outlives into a proper canonicalized type query

Browse source
This commit is contained in:
Michael Goulet 2022-11-09 18:46:57 +00:00
parent ed6a7cc228
commit 63217e08cc
1 changed files with 88 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_traits/src/dropck_outlives.rs
View file

@ -2,20 +2,18 @@ use rustc_data_structures::fx::FxHashSet;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_infer::infer::canonical::{Canonical, QueryResponse}; use rustc_infer::infer::canonical::{Canonical, QueryResponse};
use rustc_infer::infer::TyCtxtInferExt; use rustc_infer::infer::TyCtxtInferExt;
use rustc_infer::traits::TraitEngineExt as _;
use rustc_middle::ty::query::Providers; use rustc_middle::ty::query::Providers;
use rustc_middle::ty::InternalSubsts; use rustc_middle::ty::InternalSubsts;
use rustc_middle::ty::{self, EarlyBinder, ParamEnvAnd, Ty, TyCtxt}; use rustc_middle::ty::{self, EarlyBinder, ParamEnvAnd, Ty, TyCtxt};
use rustc_span::source_map::{Span, DUMMY_SP}; use rustc_span::source_map::{Span, DUMMY_SP};
use rustc_trait_selection::infer::InferCtxtBuilderExt;
use rustc_trait_selection::traits::query::dropck_outlives::trivial_dropck_outlives; use rustc_trait_selection::traits::query::dropck_outlives::trivial_dropck_outlives;
use rustc_trait_selection::traits::query::dropck_outlives::{ use rustc_trait_selection::traits::query::dropck_outlives::{
DropckConstraint, DropckOutlivesResult, DropckConstraint, DropckOutlivesResult,
}; };
use rustc_trait_selection::traits::query::normalize::AtExt; use rustc_trait_selection::traits::query::normalize::AtExt;
use rustc_trait_selection::traits::query::{CanonicalTyGoal, NoSolution}; use rustc_trait_selection::traits::query::{CanonicalTyGoal, NoSolution};
use rustc_trait_selection::traits::{ use rustc_trait_selection::traits::{Normalized, ObligationCause};
Normalized, ObligationCause, TraitEngine, TraitEngineExt as _,
};
pub(crate) fn provide(p: &mut Providers) { pub(crate) fn provide(p: &mut Providers) {
*p = Providers { dropck_outlives, adt_dtorck_constraint, ..*p }; *p = Providers { dropck_outlives, adt_dtorck_constraint, ..*p };
@ -27,9 +25,8 @@ fn dropck_outlives<'tcx>(
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>, NoSolution> { ) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>, NoSolution> {
debug!("dropck_outlives(goal={:#?})", canonical_goal); debug!("dropck_outlives(goal={:#?})", canonical_goal);
let (ref infcx, goal, canonical_inference_vars) = tcx.infer_ctxt().enter_canonical_trait_query(&canonical_goal, |ocx, goal| {
tcx.infer_ctxt().build_with_canonical(DUMMY_SP, &canonical_goal); let tcx = ocx.infcx.tcx;
let tcx = infcx.tcx;
let ParamEnvAnd { param_env, value: for_ty } = goal; let ParamEnvAnd { param_env, value: for_ty } = goal;
let mut result = DropckOutlivesResult { kinds: vec![], overflows: vec![] }; let mut result = DropckOutlivesResult { kinds: vec![], overflows: vec![] };
@ -73,8 +70,6 @@ fn dropck_outlives<'tcx>(
// Set used to detect infinite recursion. // Set used to detect infinite recursion.
let mut ty_set = FxHashSet::default(); let mut ty_set = FxHashSet::default();
let mut fulfill_cx = <dyn TraitEngine<'_>>::new(infcx.tcx);
let cause = ObligationCause::dummy(); let cause = ObligationCause::dummy();
let mut constraints = DropckConstraint::empty(); let mut constraints = DropckConstraint::empty();
while let Some((ty, depth)) = ty_stack.pop() { while let Some((ty, depth)) = ty_stack.pop() {
@ -104,9 +99,9 @@ fn dropck_outlives<'tcx>(
// do not themselves define a destructor", more or less. We have // do not themselves define a destructor", more or less. We have
// to push them onto the stack to be expanded. // to push them onto the stack to be expanded.
for ty in constraints.dtorck_types.drain(..) { for ty in constraints.dtorck_types.drain(..) {
match infcx.at(&cause, param_env).normalize(ty) { let Normalized { value: ty, obligations } =
Ok(Normalized { value: ty, obligations }) => { ocx.infcx.at(&cause, param_env).normalize(ty)?;
fulfill_cx.register_predicate_obligations(infcx, obligations); ocx.register_obligations(obligations);
debug!("dropck_outlives: ty from dtorck_types = {:?}", ty); debug!("dropck_outlives: ty from dtorck_types = {:?}", ty);
@ -128,19 +123,11 @@ fn dropck_outlives<'tcx>(
} }
} }
} }
// We don't actually expect to fail to normalize.
// That implies a WF error somewhere else.
Err(NoSolution) => {
return Err(NoSolution);
}
}
}
} }
debug!("dropck_outlives: result = {:#?}", result); debug!("dropck_outlives: result = {:#?}", result);
Ok(result)
infcx.make_canonicalized_query_response(canonical_inference_vars, result, &mut *fulfill_cx) })
} }
/// Returns a set of constraints that needs to be satisfied in /// Returns a set of constraints that needs to be satisfied in