bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_infer: Consolidate obligation elaboration de-duplication

Browse source
This commit is contained in:
Patrik Kårlin 2023-02-24 11:22:24 +01:00
parent 07c993eba8
commit 3d34538f5d
No known key found for this signature in database
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_infer/src/traits/util.rs
View file

@ -116,11 +116,11 @@ pub fn elaborate_predicates_with_span<'tcx>(
pub fn elaborate_obligations<'tcx>( pub fn elaborate_obligations<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
mut obligations: Vec<PredicateObligation<'tcx>>, obligations: Vec<PredicateObligation<'tcx>>,
) -> Elaborator<'tcx> { ) -> Elaborator<'tcx> {
let mut visited = PredicateSet::new(tcx); let mut elaborator = Elaborator { stack: Vec::new(), visited: PredicateSet::new(tcx) };
obligations.retain(|obligation| visited.insert(obligation.predicate)); elaborator.extend_deduped(obligations);
Elaborator { stack: obligations, visited } elaborator
} }
fn predicate_obligation<'tcx>( fn predicate_obligation<'tcx>(
@ -132,6 +132,15 @@ fn predicate_obligation<'tcx>(
} }
impl<'tcx> Elaborator<'tcx> { impl<'tcx> Elaborator<'tcx> {
fn extend_deduped(&mut self, obligations: impl IntoIterator<Item = PredicateObligation<'tcx>>) {
// Only keep those bounds that we haven't already seen.
// This is necessary to prevent infinite recursion in some
// cases. One common case is when people define
// `trait Sized: Sized { }` rather than `trait Sized { }`.
// let visited = &mut self.visited;
self.stack.extend(obligations.into_iter().filter(|o| self.visited.insert(o.predicate)));
}
pub fn filter_to_traits(self) -> FilterToTraits<Self> { pub fn filter_to_traits(self) -> FilterToTraits<Self> {
FilterToTraits::new(self) FilterToTraits::new(self)
} }
@ -172,15 +181,7 @@ impl<'tcx> Elaborator<'tcx> {
) )
}); });
debug!(?data, ?obligations, "super_predicates"); debug!(?data, ?obligations, "super_predicates");
self.extend_deduped(obligations);
// Only keep those bounds that we haven't already seen.
// This is necessary to prevent infinite recursion in some
// cases. One common case is when people define
// `trait Sized: Sized { }` rather than `trait Sized { }`.
let visited = &mut self.visited;
let obligations = obligations.filter(|o| visited.insert(o.predicate));
self.stack.extend(obligations);
} }
ty::PredicateKind::WellFormed(..) => { ty::PredicateKind::WellFormed(..) => {
// Currently, we do not elaborate WF predicates, // Currently, we do not elaborate WF predicates,
@ -237,10 +238,9 @@ impl<'tcx> Elaborator<'tcx> {
return; return;
} }
let visited = &mut self.visited;
let mut components = smallvec![]; let mut components = smallvec![];
push_outlives_components(tcx, ty_max, &mut components); push_outlives_components(tcx, ty_max, &mut components);
self.stack.extend( self.extend_deduped(
components components
.into_iter() .into_iter()
.filter_map(|component| match component { .filter_map(|component| match component {
@ -280,7 +280,6 @@ impl<'tcx> Elaborator<'tcx> {
.map(|predicate_kind| { .map(|predicate_kind| {
bound_predicate.rebind(predicate_kind).to_predicate(tcx) bound_predicate.rebind(predicate_kind).to_predicate(tcx)
}) })
.filter(|&predicate| visited.insert(predicate))
.map(|predicate| { .map(|predicate| {
predicate_obligation( predicate_obligation(
predicate, predicate,