Skip to content

add a cache to the WfPredicates visitor #161274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Aug 22, 2026
Merged

add a cache to the WfPredicates visitor #161274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions compiler/rustc_trait_selection/src/traits/wf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use rustc_hir::attrs::lang_items::LangItem;
use rustc_infer::traits::{ObligationCauseCode, PredicateObligations};
use rustc_middle::bug;
use rustc_middle::ty::{
self, GenericArgsRef, Term, TermKind, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
TypeVisitableExt, TypeVisitor,
self, DelayedSet, GenericArgsRef, Term, TermKind, Ty, TyCtxt, TypeSuperVisitable,
TypeVisitable, TypeVisitableExt, TypeVisitor,
};
use rustc_session::diagnostics::feature_err;
use rustc_span::def_id::{DefId, LocalDefId};
Expand Down Expand Up @@ -77,6 +77,7 @@ pub fn obligations<'tcx>(
out: PredicateObligations::new(),
recursion_depth,
item: None,
visited_tys: Default::default(),
};
wf.add_wf_preds_for_term(term);
debug!("wf::obligations({:?}, body_def_id={:?}) = {:?}", term, body_def_id, wf.out);
Expand Down Expand Up @@ -114,6 +115,7 @@ pub fn unnormalized_obligations<'tcx>(
out: PredicateObligations::new(),
recursion_depth: 0,
item: None,
visited_tys: Default::default(),
};
wf.add_wf_preds_for_term(term);
Some(wf.out)
Expand All @@ -139,6 +141,7 @@ pub fn trait_obligations<'tcx>(
out: PredicateObligations::new(),
recursion_depth: 0,
item: Some(item),
visited_tys: Default::default(),
};
wf.add_wf_preds_for_trait_pred(trait_pred, Elaborate::All);
debug!(obligations = ?wf.out);
Expand Down Expand Up @@ -166,6 +169,7 @@ pub fn clause_obligations<'tcx>(
out: PredicateObligations::new(),
recursion_depth: 0,
item: None,
visited_tys: Default::default(),
};

// It's ok to skip the binder here because wf code is prepared for it
Expand Down Expand Up @@ -210,6 +214,7 @@ struct WfPredicates<'a, 'tcx> {
out: PredicateObligations<'tcx>,
recursion_depth: usize,
item: Option<&'tcx hir::Item<'tcx>>,
visited_tys: DelayedSet<Ty<'tcx>>,
}

/// Controls whether we "elaborate" supertraits and so forth on the WF
Expand Down Expand Up @@ -722,6 +727,10 @@ impl<'a, 'tcx> TypeVisitor<TyCtxt<'tcx>> for WfPredicates<'a, 'tcx> {
fn visit_ty(&mut self, t: Ty<'tcx>) -> Self::Result {
debug!("wf bounds for t={:?} t.kind={:#?}", t, t.kind());

if !self.visited_tys.insert(t) {
return;
}

let tcx = self.tcx();

match *t.kind() {
Expand Down
Loading