Skip to content

Commit c51953f

Browse files
BryanskiyBryanskiy
committed
Use DeepRejectCtxt to quickly reject ParamEnv candidates
1 parent 717aec0 commit c51953f

File tree

16 files changed

+272
-152
lines changed

16 files changed

+272
-152
lines changed

‎compiler/rustc_hir_analysis/src/coherence/inherent_impls.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ impl<'tcx> InherentCollect<'tcx> {
9090
}
9191
}
9292

93-
if let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::AsCandidateKey) {
93+
if let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::InstantiateWithInfer)
94+
{
9495
self.impls_map.incoherent_impls.entry(simp).or_default().push(impl_def_id);
9596
} else {
9697
bug!("unexpected self type: {:?}", self_ty);
@@ -129,7 +130,7 @@ impl<'tcx> InherentCollect<'tcx> {
129130
}
130131
}
131132

132-
if let Some(simp) = simplify_type(self.tcx, ty, TreatParams::AsCandidateKey) {
133+
if let Some(simp) = simplify_type(self.tcx, ty, TreatParams::InstantiateWithInfer) {
133134
self.impls_map.incoherent_impls.entry(simp).or_default().push(impl_def_id);
134135
} else {
135136
bug!("unexpected primitive type: {:?}", ty);

‎compiler/rustc_hir_typeck/src/method/probe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
714714
}
715715

716716
fn assemble_inherent_candidates_for_incoherent_ty(&mut self, self_ty: Ty<'tcx>) {
717-
let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::AsCandidateKey) else {
717+
let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::InstantiateWithInfer) else {
718718
bug!("unexpected incoherent type: {:?}", self_ty)
719719
};
720720
for &impl_def_id in self.tcx.incoherent_impls(simp).into_iter().flatten() {

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -2234,8 +2234,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
22342234
let target_ty = self
22352235
.autoderef(sugg_span, rcvr_ty)
22362236
.find(|(rcvr_ty, _)| {
2237-
DeepRejectCtxt::new(self.tcx, TreatParams::ForLookup)
2238-
.types_may_unify(*rcvr_ty, impl_ty)
2237+
DeepRejectCtxt::relate_rigid_infer(self.tcx).types_may_unify(*rcvr_ty, impl_ty)
22392238
})
22402239
.map_or(impl_ty, |(ty, _)| ty)
22412240
.peel_refs();
@@ -2497,7 +2496,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
24972496
.into_iter()
24982497
.any(|info| self.associated_value(info.def_id, item_name).is_some());
24992498
let found_assoc = |ty: Ty<'tcx>| {
2500-
simplify_type(tcx, ty, TreatParams::AsCandidateKey)
2499+
simplify_type(tcx, ty, TreatParams::InstantiateWithInfer)
25012500
.and_then(|simp| {
25022501
tcx.incoherent_impls(simp)
25032502
.into_iter()
@@ -3962,7 +3961,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
39623961
// cases where a positive bound implies a negative impl.
39633962
(candidates, Vec::new())
39643963
} else if let Some(simp_rcvr_ty) =
3965-
simplify_type(self.tcx, rcvr_ty, TreatParams::ForLookup)
3964+
simplify_type(self.tcx, rcvr_ty, TreatParams::AsRigid)
39663965
{
39673966
let mut potential_candidates = Vec::new();
39683967
let mut explicitly_negative = Vec::new();
@@ -3980,7 +3979,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
39803979
.any(|header| {
39813980
let imp = header.trait_ref.instantiate_identity();
39823981
let imp_simp =
3983-
simplify_type(self.tcx, imp.self_ty(), TreatParams::ForLookup);
3982+
simplify_type(self.tcx, imp.self_ty(), TreatParams::AsRigid);
39843983
imp_simp.is_some_and(|s| s == simp_rcvr_ty)
39853984
})
39863985
{

‎compiler/rustc_metadata/src/rmeta/encoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
20172017
let simplified_self_ty = fast_reject::simplify_type(
20182018
self.tcx,
20192019
trait_ref.self_ty(),
2020-
TreatParams::AsCandidateKey,
2020+
TreatParams::InstantiateWithInfer,
20212021
);
20222022
trait_impls
20232023
.entry(trait_ref.def_id)

‎compiler/rustc_middle/src/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
428428
let simp = ty::fast_reject::simplify_type(
429429
tcx,
430430
self_ty,
431-
ty::fast_reject::TreatParams::ForLookup,
431+
ty::fast_reject::TreatParams::AsRigid,
432432
)
433433
.unwrap();
434434
consider_impls_for_simplified_type(simp);

‎compiler/rustc_middle/src/ty/fast_reject.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ pub use rustc_type_ir::fast_reject::*;
33

44
use super::TyCtxt;
55

6-
pub type DeepRejectCtxt<'tcx> = rustc_type_ir::fast_reject::DeepRejectCtxt<TyCtxt<'tcx>>;
6+
pub type DeepRejectCtxt<
7+
'tcx,
8+
const INSTANTIATE_LHS_WITH_INFER: bool,
9+
const INSTANTIATE_RHS_WITH_INFER: bool,
10+
> = rustc_type_ir::fast_reject::DeepRejectCtxt<
11+
TyCtxt<'tcx>,
12+
INSTANTIATE_LHS_WITH_INFER,
13+
INSTANTIATE_RHS_WITH_INFER,
14+
>;
715

816
pub type SimplifiedType = rustc_type_ir::fast_reject::SimplifiedType<DefId>;

‎compiler/rustc_middle/src/ty/trait_def.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ impl<'tcx> TyCtxt<'tcx> {
168168
// whose outer level is not a parameter or projection. Especially for things like
169169
// `T: Clone` this is incredibly useful as we would otherwise look at all the impls
170170
// of `Clone` for `Option<T>`, `Vec<T>`, `ConcreteType` and so on.
171-
// Note that we're using `TreatParams::ForLookup` to query `non_blanket_impls` while using
172-
// `TreatParams::AsCandidateKey` while actually adding them.
173-
if let Some(simp) = fast_reject::simplify_type(self, self_ty, TreatParams::ForLookup) {
171+
// Note that we're using `TreatParams::AsRigid` to query `non_blanket_impls` while using
172+
// `TreatParams::InstantiateWithInfer` while actually adding them.
173+
if let Some(simp) = fast_reject::simplify_type(self, self_ty, TreatParams::AsRigid) {
174174
if let Some(impls) = impls.non_blanket_impls.get(&simp) {
175175
for &impl_def_id in impls {
176176
f(impl_def_id);
@@ -190,7 +190,9 @@ impl<'tcx> TyCtxt<'tcx> {
190190
self_ty: Ty<'tcx>,
191191
) -> impl Iterator<Item = DefId> + 'tcx {
192192
let impls = self.trait_impls_of(trait_def_id);
193-
if let Some(simp) = fast_reject::simplify_type(self, self_ty, TreatParams::AsCandidateKey) {
193+
if let Some(simp) =
194+
fast_reject::simplify_type(self, self_ty, TreatParams::InstantiateWithInfer)
195+
{
194196
if let Some(impls) = impls.non_blanket_impls.get(&simp) {
195197
return impls.iter().copied();
196198
}
@@ -239,7 +241,7 @@ pub(super) fn trait_impls_of_provider(tcx: TyCtxt<'_>, trait_id: DefId) -> Trait
239241
let impl_self_ty = tcx.type_of(impl_def_id).instantiate_identity();
240242

241243
if let Some(simplified_self_ty) =
242-
fast_reject::simplify_type(tcx, impl_self_ty, TreatParams::AsCandidateKey)
244+
fast_reject::simplify_type(tcx, impl_self_ty, TreatParams::InstantiateWithInfer)
243245
{
244246
impls.non_blanket_impls.entry(simplified_self_ty).or_default().push(impl_def_id);
245247
} else {

‎compiler/rustc_next_trait_solver/src/solve/normalizes_to/mod.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mod inherent;
33
mod opaque_types;
44
mod weak_types;
55

6-
use rustc_type_ir::fast_reject::{DeepRejectCtxt, TreatParams};
6+
use rustc_type_ir::fast_reject::DeepRejectCtxt;
77
use rustc_type_ir::inherent::*;
88
use rustc_type_ir::lang_items::TraitSolverLangItem;
99
use rustc_type_ir::{self as ty, Interner, NormalizesTo, Upcast as _};
@@ -106,6 +106,12 @@ where
106106
if let Some(projection_pred) = assumption.as_projection_clause() {
107107
if projection_pred.projection_def_id() == goal.predicate.def_id() {
108108
let cx = ecx.cx();
109+
if !DeepRejectCtxt::relate_rigid_rigid(ecx.cx()).args_may_unify(
110+
goal.predicate.alias.args,
111+
projection_pred.skip_binder().projection_term.args,
112+
) {
113+
return Err(NoSolution);
114+
}
109115
ecx.probe_trait_candidate(source).enter(|ecx| {
110116
let assumption_projection_pred =
111117
ecx.instantiate_binder_with_infer(projection_pred);
@@ -144,7 +150,7 @@ where
144150

145151
let goal_trait_ref = goal.predicate.alias.trait_ref(cx);
146152
let impl_trait_ref = cx.impl_trait_ref(impl_def_id);
147-
if !DeepRejectCtxt::new(ecx.cx(), TreatParams::ForLookup).args_may_unify(
153+
if !DeepRejectCtxt::relate_rigid_infer(ecx.cx()).args_may_unify(
148154
goal.predicate.alias.trait_ref(cx).args,
149155
impl_trait_ref.skip_binder().args,
150156
) {

‎compiler/rustc_next_trait_solver/src/solve/trait_goals.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use rustc_ast_ir::Movability;
44
use rustc_type_ir::data_structures::IndexSet;
5-
use rustc_type_ir::fast_reject::{DeepRejectCtxt, TreatParams};
5+
use rustc_type_ir::fast_reject::DeepRejectCtxt;
66
use rustc_type_ir::inherent::*;
77
use rustc_type_ir::lang_items::TraitSolverLangItem;
88
use rustc_type_ir::visit::TypeVisitableExt as _;
@@ -47,7 +47,7 @@ where
4747
let cx = ecx.cx();
4848

4949
let impl_trait_ref = cx.impl_trait_ref(impl_def_id);
50-
if !DeepRejectCtxt::new(ecx.cx(), TreatParams::ForLookup)
50+
if !DeepRejectCtxt::relate_rigid_infer(ecx.cx())
5151
.args_may_unify(goal.predicate.trait_ref.args, impl_trait_ref.skip_binder().args)
5252
{
5353
return Err(NoSolution);
@@ -124,6 +124,13 @@ where
124124
if trait_clause.def_id() == goal.predicate.def_id()
125125
&& trait_clause.polarity() == goal.predicate.polarity
126126
{
127+
if !DeepRejectCtxt::relate_rigid_rigid(ecx.cx()).args_may_unify(
128+
goal.predicate.trait_ref.args,
129+
trait_clause.skip_binder().trait_ref.args,
130+
) {
131+
return Err(NoSolution);
132+
}
133+
127134
ecx.probe_trait_candidate(source).enter(|ecx| {
128135
let assumption_trait_pred = ecx.instantiate_binder_with_infer(trait_clause);
129136
ecx.eq(

‎compiler/rustc_trait_selection/src/error_reporting/infer/note_and_explain.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_hir as hir;
44
use rustc_hir::def::DefKind;
55
use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
66
use rustc_middle::ty::error::{ExpectedFound, TypeError};
7-
use rustc_middle::ty::fast_reject::{DeepRejectCtxt, TreatParams};
7+
use rustc_middle::ty::fast_reject::DeepRejectCtxt;
88
use rustc_middle::ty::print::{FmtPrinter, Printer};
99
use rustc_middle::ty::{self, suggest_constraining_type_param, Ty};
1010
use rustc_span::def_id::DefId;
@@ -316,7 +316,7 @@ impl<T> Trait<T> for X {
316316
{
317317
let mut has_matching_impl = false;
318318
tcx.for_each_relevant_impl(def_id, values.found, |did| {
319-
if DeepRejectCtxt::new(tcx, TreatParams::ForLookup)
319+
if DeepRejectCtxt::relate_rigid_infer(tcx)
320320
.types_may_unify(values.found, tcx.type_of(did).skip_binder())
321321
{
322322
has_matching_impl = true;
@@ -337,7 +337,7 @@ impl<T> Trait<T> for X {
337337
{
338338
let mut has_matching_impl = false;
339339
tcx.for_each_relevant_impl(def_id, values.expected, |did| {
340-
if DeepRejectCtxt::new(tcx, TreatParams::ForLookup)
340+
if DeepRejectCtxt::relate_rigid_infer(tcx)
341341
.types_may_unify(values.expected, tcx.type_of(did).skip_binder())
342342
{
343343
has_matching_impl = true;
@@ -357,7 +357,7 @@ impl<T> Trait<T> for X {
357357
{
358358
let mut has_matching_impl = false;
359359
tcx.for_each_relevant_impl(def_id, values.found, |did| {
360-
if DeepRejectCtxt::new(tcx, TreatParams::ForLookup)
360+
if DeepRejectCtxt::relate_rigid_infer(tcx)
361361
.types_may_unify(values.found, tcx.type_of(did).skip_binder())
362362
{
363363
has_matching_impl = true;

‎compiler/rustc_trait_selection/src/traits/coherence.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_middle::bug;
1515
use rustc_middle::traits::query::NoSolution;
1616
use rustc_middle::traits::solve::{CandidateSource, Certainty, Goal};
1717
use rustc_middle::traits::specialization_graph::OverlapMode;
18-
use rustc_middle::ty::fast_reject::{DeepRejectCtxt, TreatParams};
18+
use rustc_middle::ty::fast_reject::DeepRejectCtxt;
1919
use rustc_middle::ty::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor};
2020
use rustc_middle::ty::{self, Ty, TyCtxt};
2121
pub use rustc_next_trait_solver::coherence::*;
@@ -94,7 +94,7 @@ pub fn overlapping_impls(
9494
// Before doing expensive operations like entering an inference context, do
9595
// a quick check via fast_reject to tell if the impl headers could possibly
9696
// unify.
97-
let drcx = DeepRejectCtxt::new(tcx, TreatParams::AsCandidateKey);
97+
let drcx = DeepRejectCtxt::relate_infer_infer(tcx);
9898
let impl1_ref = tcx.impl_trait_ref(impl1_def_id);
9999
let impl2_ref = tcx.impl_trait_ref(impl2_def_id);
100100
let may_overlap = match (impl1_ref, impl2_ref) {

‎compiler/rustc_trait_selection/src/traits/project.rs

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use rustc_infer::traits::ObligationCauseCode;
1313
use rustc_middle::traits::select::OverflowError;
1414
pub use rustc_middle::traits::Reveal;
1515
use rustc_middle::traits::{BuiltinImplSource, ImplSource, ImplSourceUserDefinedData};
16+
use rustc_middle::ty::fast_reject::DeepRejectCtxt;
1617
use rustc_middle::ty::fold::TypeFoldable;
1718
use rustc_middle::ty::visit::{MaxUniverse, TypeVisitable, TypeVisitableExt};
1819
use rustc_middle::ty::{self, Term, Ty, TyCtxt, Upcast};
@@ -885,6 +886,7 @@ fn assemble_candidates_from_predicates<'cx, 'tcx>(
885886
potentially_unnormalized_candidates: bool,
886887
) {
887888
let infcx = selcx.infcx;
889+
let drcx = DeepRejectCtxt::relate_rigid_rigid(selcx.tcx());
888890
for predicate in env_predicates {
889891
let bound_predicate = predicate.kind();
890892
if let ty::ClauseKind::Projection(data) = predicate.kind().skip_binder() {
@@ -893,6 +895,12 @@ fn assemble_candidates_from_predicates<'cx, 'tcx>(
893895
continue;
894896
}
895897

898+
if !drcx
899+
.args_may_unify(obligation.predicate.args, data.skip_binder().projection_term.args)
900+
{
901+
continue;
902+
}
903+
896904
let is_match = infcx.probe(|_| {
897905
selcx.match_projection_projections(
898906
obligation,

‎compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use hir::LangItem;
1313
use rustc_data_structures::fx::{FxHashSet, FxIndexSet};
1414
use rustc_hir as hir;
1515
use rustc_infer::traits::{Obligation, ObligationCause, PolyTraitObligation, SelectionError};
16-
use rustc_middle::ty::fast_reject::{DeepRejectCtxt, TreatParams};
16+
use rustc_middle::ty::fast_reject::DeepRejectCtxt;
1717
use rustc_middle::ty::{self, ToPolyTraitRef, Ty, TypeVisitableExt};
1818
use rustc_middle::{bug, span_bug};
1919

@@ -247,11 +247,17 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
247247
.filter(|p| p.def_id() == stack.obligation.predicate.def_id())
248248
.filter(|p| p.polarity() == stack.obligation.predicate.polarity());
249249

250+
let drcx = DeepRejectCtxt::relate_rigid_rigid(self.tcx());
251+
let obligation_args = stack.obligation.predicate.skip_binder().trait_ref.args;
250252
// Keep only those bounds which may apply, and propagate overflow if it occurs.
251253
for bound in bounds {
254+
let bound_trait_ref = bound.map_bound(|t| t.trait_ref);
255+
if !drcx.args_may_unify(obligation_args, bound_trait_ref.skip_binder().args) {
256+
continue;
257+
}
252258
// FIXME(oli-obk): it is suspicious that we are dropping the constness and
253259
// polarity here.
254-
let wc = self.where_clause_may_apply(stack, bound.map_bound(|t| t.trait_ref))?;
260+
let wc = self.where_clause_may_apply(stack, bound_trait_ref)?;
255261
if wc.may_apply() {
256262
candidates.vec.push(ParamCandidate(bound));
257263
}
@@ -580,7 +586,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
580586
return;
581587
}
582588

583-
let drcx = DeepRejectCtxt::new(self.tcx(), TreatParams::ForLookup);
589+
let drcx = DeepRejectCtxt::relate_rigid_infer(self.tcx());
584590
let obligation_args = obligation.predicate.skip_binder().trait_ref.args;
585591
self.tcx().for_each_relevant_impl(
586592
obligation.predicate.def_id(),

‎compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl<'tcx> Children {
4040
fn insert_blindly(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId) {
4141
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().skip_binder();
4242
if let Some(st) =
43-
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::AsCandidateKey)
43+
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::InstantiateWithInfer)
4444
{
4545
debug!("insert_blindly: impl_def_id={:?} st={:?}", impl_def_id, st);
4646
self.non_blanket_impls.entry(st).or_default().push(impl_def_id)
@@ -57,7 +57,7 @@ impl<'tcx> Children {
5757
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().skip_binder();
5858
let vec: &mut Vec<DefId>;
5959
if let Some(st) =
60-
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::AsCandidateKey)
60+
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::InstantiateWithInfer)
6161
{
6262
debug!("remove_existing: impl_def_id={:?} st={:?}", impl_def_id, st);
6363
vec = self.non_blanket_impls.get_mut(&st).unwrap();
@@ -278,7 +278,7 @@ impl<'tcx> Graph {
278278
let mut parent = trait_def_id;
279279
let mut last_lint = None;
280280
let simplified =
281-
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::AsCandidateKey);
281+
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::InstantiateWithInfer);
282282

283283
// Descend the specialization tree, where `parent` is the current parent node.
284284
loop {

0 commit comments

Comments
 (0)