Skip to content

[perf] Don't use true fulfillment errors in method probe #142202

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

Closed
wants to merge 1 commit into from
Closed

[perf] Don't use true fulfillment errors in method probe #142202

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
30 changes: 3 additions & 27 deletions compiler/rustc_hir_typeck/src/method/probe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,9 +1807,8 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {

let mut result = ProbeResult::Match;
let cause = &self.misc(self.span);
let ocx = ObligationCtxt::new_with_diagnostics(self);
let ocx = ObligationCtxt::new(self);

let mut trait_predicate = None;
let (mut xform_self_ty, mut xform_ret_ty);

match probe.kind {
Expand Down Expand Up @@ -1932,8 +1931,6 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
}
}
}

trait_predicate = Some(trait_ref.upcast(self.tcx));
}
ObjectCandidate(poly_trait_ref) | WhereClauseCandidate(poly_trait_ref) => {
let trait_ref = self.instantiate_binder_with_fresh_vars(
Expand Down Expand Up @@ -1978,23 +1975,8 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
}

// Evaluate those obligations to see if they might possibly hold.
for error in ocx.select_where_possible() {
for _error in ocx.select_where_possible() {
result = ProbeResult::NoMatch;
let nested_predicate = self.resolve_vars_if_possible(error.obligation.predicate);
if let Some(trait_predicate) = trait_predicate
&& nested_predicate == self.resolve_vars_if_possible(trait_predicate)
{
// Don't report possibly unsatisfied predicates if the root
// trait obligation from a `TraitCandidate` is unsatisfied.
// That just means the candidate doesn't hold.
} else {
possibly_unsatisfied_predicates.push((
nested_predicate,
Some(self.resolve_vars_if_possible(error.root_obligation.predicate))
.filter(|root_predicate| *root_predicate != nested_predicate),
Some(error.obligation.cause),
));
}
}

if let ProbeResult::Match = result
Expand All @@ -2018,14 +2000,8 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
}

// Evaluate those obligations to see if they might possibly hold.
for error in ocx.select_where_possible() {
for _error in ocx.select_where_possible() {
result = ProbeResult::NoMatch;
possibly_unsatisfied_predicates.push((
error.obligation.predicate,
Some(error.root_obligation.predicate)
.filter(|predicate| *predicate != error.obligation.predicate),
Some(error.root_obligation.cause),
));
}
}

Expand Down
Loading