bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Retry pred_known_to_hold_modulo_regions with fulfillment if ambiguous

Browse source
This commit is contained in:
Michael Goulet 2023-03-04 23:31:56 +00:00
parent 276b75a843
commit 118afdf071
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/traits/mod.rs
View file

@ -155,10 +155,12 @@ fn pred_known_to_hold_modulo_regions<'tcx>(
predicate: pred.to_predicate(infcx.tcx), predicate: pred.to_predicate(infcx.tcx),
}; };
let result = infcx.predicate_must_hold_modulo_regions(&obligation); let result = infcx.evaluate_obligation_no_overflow(&obligation);
debug!(?result); debug!(?result);
if result && has_non_region_infer { if result.must_apply_modulo_regions() && !has_non_region_infer {
true
} else if result.may_apply() {
// Because of inference "guessing", selection can sometimes claim // Because of inference "guessing", selection can sometimes claim
// to succeed while the success requires a guess. To ensure // to succeed while the success requires a guess. To ensure
// this function's result remains infallible, we must confirm // this function's result remains infallible, we must confirm
@ -179,7 +181,7 @@ fn pred_known_to_hold_modulo_regions<'tcx>(
} }
} }
} else { } else {
result false
} }
} }