bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

add cache to AmbiguityCausesVisitor

Browse source
This commit is contained in:
lcnr 2025-01-17 10:01:45 +01:00
parent ebbcfd4e77
commit 94bf8f04f4
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_trait_selection/src/traits/coherence.rs
View file

@ -6,7 +6,7 @@
use std::fmt::Debug; use std::fmt::Debug;
use rustc_data_structures::fx::FxIndexSet; use rustc_data_structures::fx::{FxHashSet, FxIndexSet};
use rustc_errors::{Diag, EmissionGuarantee}; use rustc_errors::{Diag, EmissionGuarantee};
use rustc_hir::def::DefKind; use rustc_hir::def::DefKind;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
@ -626,6 +626,7 @@ fn compute_intercrate_ambiguity_causes<'tcx>(
} }
struct AmbiguityCausesVisitor<'a, 'tcx> { struct AmbiguityCausesVisitor<'a, 'tcx> {
cache: FxHashSet<Goal<'tcx, ty::Predicate<'tcx>>>,
causes: &'a mut FxIndexSet<IntercrateAmbiguityCause<'tcx>>, causes: &'a mut FxIndexSet<IntercrateAmbiguityCause<'tcx>>,
} }
@ -635,6 +636,10 @@ impl<'a, 'tcx> ProofTreeVisitor<'tcx> for AmbiguityCausesVisitor<'a, 'tcx> {
} }
fn visit_goal(&mut self, goal: &InspectGoal<'_, 'tcx>) { fn visit_goal(&mut self, goal: &InspectGoal<'_, 'tcx>) {
if !self.cache.insert(goal.goal()) {
return;
}
let infcx = goal.infcx(); let infcx = goal.infcx();
for cand in goal.candidates() { for cand in goal.candidates() {
cand.visit_nested_in_probe(self); cand.visit_nested_in_probe(self);
@ -759,5 +764,10 @@ fn search_ambiguity_causes<'tcx>(
goal: Goal<'tcx, ty::Predicate<'tcx>>, goal: Goal<'tcx, ty::Predicate<'tcx>>,
causes: &mut FxIndexSet<IntercrateAmbiguityCause<'tcx>>, causes: &mut FxIndexSet<IntercrateAmbiguityCause<'tcx>>,
) { ) {
infcx.probe(|_| infcx.visit_proof_tree(goal, &mut AmbiguityCausesVisitor { causes })); infcx.probe(|_| {
infcx.visit_proof_tree(goal, &mut AmbiguityCausesVisitor {
cache: Default::default(),
causes,
})
});
} }