Auto merge of #119934 - compiler-errors:could-impl, r=jackh726
Make `InferCtxtExt::could_impl_trait` more precise, less ICEy The implementation for `InferCtxtExt::could_impl_trait` was very wrong. Along with being pretty poorly named, way too specific to ADTs, it was also doing impl substitution wrong -- this caused an ICE (#119915). This PR generalizes that code, gives it a clearer name, makes it stop using the new trait solver (lol), and fixes some fallout bad suggestions that are made worse with the code fix. Fixes #119915
This commit is contained in:
commit
0dab65b8a1
15 changed files with 128 additions and 101 deletions
|
@ -1,13 +1,14 @@
|
|||
use crate::solve::FulfillmentCtxt;
|
||||
use crate::traits::query::evaluate_obligation::InferCtxtExt as _;
|
||||
use crate::traits::{self, DefiningAnchor, ObligationCtxt};
|
||||
use crate::traits::{self, DefiningAnchor, ObligationCtxt, SelectionContext};
|
||||
|
||||
use crate::traits::TraitEngineExt as _;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_hir::lang_items::LangItem;
|
||||
use rustc_infer::traits::{TraitEngine, TraitEngineExt};
|
||||
use rustc_infer::traits::{Obligation, TraitEngine, TraitEngineExt as _};
|
||||
use rustc_middle::arena::ArenaAllocatable;
|
||||
use rustc_middle::infer::canonical::{Canonical, CanonicalQueryResponse, QueryResponse};
|
||||
use rustc_middle::traits::query::NoSolution;
|
||||
use rustc_middle::traits::ObligationCause;
|
||||
use rustc_middle::ty::{self, Ty, TyCtxt, TypeFoldable, TypeVisitableExt};
|
||||
use rustc_middle::ty::{GenericArg, ToPredicate};
|
||||
use rustc_span::DUMMY_SP;
|
||||
|
@ -21,7 +22,8 @@ pub trait InferCtxtExt<'tcx> {
|
|||
|
||||
fn type_is_sized_modulo_regions(&self, param_env: ty::ParamEnv<'tcx>, ty: Ty<'tcx>) -> bool;
|
||||
|
||||
/// Check whether a `ty` implements given trait(trait_def_id).
|
||||
/// Check whether a `ty` implements given trait(trait_def_id) without side-effects.
|
||||
///
|
||||
/// The inputs are:
|
||||
///
|
||||
/// - the def-id of the trait
|
||||
|
@ -29,8 +31,8 @@ pub trait InferCtxtExt<'tcx> {
|
|||
/// - the parameter environment
|
||||
///
|
||||
/// Invokes `evaluate_obligation`, so in the event that evaluating
|
||||
/// `Ty: Trait` causes overflow, EvaluatedToErrStackDependent (or EvaluatedToAmbigStackDependent)
|
||||
/// will be returned.
|
||||
/// `Ty: Trait` causes overflow, EvaluatedToErrStackDependent
|
||||
/// (or EvaluatedToAmbigStackDependent) will be returned.
|
||||
fn type_implements_trait(
|
||||
&self,
|
||||
trait_def_id: DefId,
|
||||
|
@ -38,7 +40,18 @@ pub trait InferCtxtExt<'tcx> {
|
|||
param_env: ty::ParamEnv<'tcx>,
|
||||
) -> traits::EvaluationResult;
|
||||
|
||||
fn could_impl_trait(
|
||||
/// Returns `Some` if a type implements a trait shallowly, without side-effects,
|
||||
/// along with any errors that would have been reported upon further obligation
|
||||
/// processing.
|
||||
///
|
||||
/// - If this returns `Some([])`, then the trait holds modulo regions.
|
||||
/// - If this returns `Some([errors..])`, then the trait has an impl for
|
||||
/// the self type, but some nested obligations do not hold.
|
||||
/// - If this returns `None`, no implementation that applies could be found.
|
||||
///
|
||||
/// FIXME(-Znext-solver): Due to the recursive nature of the new solver,
|
||||
/// this will probably only ever return `Some([])` or `None`.
|
||||
fn type_implements_trait_shallow(
|
||||
&self,
|
||||
trait_def_id: DefId,
|
||||
ty: Ty<'tcx>,
|
||||
|
@ -86,64 +99,26 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
|
|||
self.evaluate_obligation(&obligation).unwrap_or(traits::EvaluationResult::EvaluatedToErr)
|
||||
}
|
||||
|
||||
fn could_impl_trait(
|
||||
fn type_implements_trait_shallow(
|
||||
&self,
|
||||
trait_def_id: DefId,
|
||||
ty: Ty<'tcx>,
|
||||
param_env: ty::ParamEnv<'tcx>,
|
||||
) -> Option<Vec<traits::FulfillmentError<'tcx>>> {
|
||||
self.probe(|_snapshot| {
|
||||
if let ty::Adt(def, args) = ty.kind()
|
||||
&& let Some((impl_def_id, _)) = self
|
||||
.tcx
|
||||
.all_impls(trait_def_id)
|
||||
.filter_map(|impl_def_id| {
|
||||
self.tcx.impl_trait_ref(impl_def_id).map(|r| (impl_def_id, r))
|
||||
})
|
||||
.map(|(impl_def_id, imp)| (impl_def_id, imp.skip_binder()))
|
||||
.find(|(_, imp)| match imp.self_ty().peel_refs().kind() {
|
||||
ty::Adt(i_def, _) if i_def.did() == def.did() => true,
|
||||
_ => false,
|
||||
})
|
||||
{
|
||||
let mut fulfill_cx = FulfillmentCtxt::new(self);
|
||||
// We get all obligations from the impl to talk about specific
|
||||
// trait bounds.
|
||||
let obligations = self
|
||||
.tcx
|
||||
.predicates_of(impl_def_id)
|
||||
.instantiate(self.tcx, args)
|
||||
.into_iter()
|
||||
.map(|(clause, span)| {
|
||||
traits::Obligation::new(
|
||||
self.tcx,
|
||||
traits::ObligationCause::dummy_with_span(span),
|
||||
param_env,
|
||||
clause,
|
||||
)
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
fulfill_cx.register_predicate_obligations(self, obligations);
|
||||
let trait_ref = ty::TraitRef::new(self.tcx, trait_def_id, [ty]);
|
||||
let obligation = traits::Obligation::new(
|
||||
self.tcx,
|
||||
traits::ObligationCause::dummy(),
|
||||
param_env,
|
||||
trait_ref,
|
||||
);
|
||||
fulfill_cx.register_predicate_obligation(self, obligation);
|
||||
let mut errors = fulfill_cx.select_all_or_error(self);
|
||||
// We remove the last predicate failure, which corresponds to
|
||||
// the top-level obligation, because most of the type we only
|
||||
// care about the other ones, *except* when it is the only one.
|
||||
// This seems to only be relevant for arbitrary self-types.
|
||||
// Look at `tests/ui/moves/move-fn-self-receiver.rs`.
|
||||
if errors.len() > 1 {
|
||||
errors.truncate(errors.len() - 1);
|
||||
let mut selcx = SelectionContext::new(self);
|
||||
match selcx.select(&Obligation::new(
|
||||
self.tcx,
|
||||
ObligationCause::dummy(),
|
||||
param_env,
|
||||
ty::TraitRef::new(self.tcx, trait_def_id, [ty]),
|
||||
)) {
|
||||
Ok(Some(selection)) => {
|
||||
let mut fulfill_cx = <dyn TraitEngine<'tcx>>::new(self);
|
||||
fulfill_cx.register_predicate_obligations(self, selection.nested_obligations());
|
||||
Some(fulfill_cx.select_all_or_error(self))
|
||||
}
|
||||
Some(errors)
|
||||
} else {
|
||||
None
|
||||
Ok(None) | Err(_) => None,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
@ -36,6 +36,11 @@ pub struct FulfillmentCtxt<'tcx> {
|
|||
|
||||
impl<'tcx> FulfillmentCtxt<'tcx> {
|
||||
pub fn new(infcx: &InferCtxt<'tcx>) -> FulfillmentCtxt<'tcx> {
|
||||
assert!(
|
||||
infcx.next_trait_solver(),
|
||||
"new trait solver fulfillment context created when \
|
||||
infcx is set up for old trait solver"
|
||||
);
|
||||
FulfillmentCtxt { obligations: Vec::new(), usable_in_snapshot: infcx.num_open_snapshots() }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -80,6 +80,11 @@ static_assert_size!(PendingPredicateObligation<'_>, 72);
|
|||
impl<'tcx> FulfillmentContext<'tcx> {
|
||||
/// Creates a new fulfillment context.
|
||||
pub(super) fn new(infcx: &InferCtxt<'tcx>) -> FulfillmentContext<'tcx> {
|
||||
assert!(
|
||||
!infcx.next_trait_solver(),
|
||||
"old trait solver fulfillment context created when \
|
||||
infcx is set up for new trait solver"
|
||||
);
|
||||
FulfillmentContext {
|
||||
predicates: ObligationForest::new(),
|
||||
usable_in_snapshot: infcx.num_open_snapshots(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue