Fix perf issue for auto trait selection
This commit is contained in:
parent
3fe3b89cd5
commit
ad88732254
3 changed files with 29 additions and 2 deletions
|
@ -999,6 +999,15 @@ impl<'tcx> PolyTraitRef<'tcx> {
|
||||||
polarity: ty::ImplPolarity::Positive,
|
polarity: ty::ImplPolarity::Positive,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Same as [`PolyTraitRef::to_poly_trait_predicate`] but sets a negative polarity instead.
|
||||||
|
pub fn to_poly_trait_predicate_negative_polarity(&self) -> ty::PolyTraitPredicate<'tcx> {
|
||||||
|
self.map_bound(|trait_ref| ty::TraitPredicate {
|
||||||
|
trait_ref,
|
||||||
|
constness: ty::BoundConstness::NotConst,
|
||||||
|
polarity: ty::ImplPolarity::Negative,
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// An existential reference to a trait, where `Self` is erased.
|
/// An existential reference to a trait, where `Self` is erased.
|
||||||
|
|
|
@ -94,6 +94,24 @@ impl<'tcx> AutoTraitFinder<'tcx> {
|
||||||
trait_pred.to_poly_trait_predicate(),
|
trait_pred.to_poly_trait_predicate(),
|
||||||
));
|
));
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(Some(ImplSource::UserDefined(_))) => {
|
||||||
|
debug!(
|
||||||
|
"find_auto_trait_generics({:?}): \
|
||||||
|
manual impl found, bailing out",
|
||||||
|
trait_ref
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
let result = selcx.select(&Obligation::new(
|
||||||
|
ObligationCause::dummy(),
|
||||||
|
orig_env,
|
||||||
|
trait_pred.to_poly_trait_predicate_negative_polarity(),
|
||||||
|
));
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(Some(ImplSource::UserDefined(_))) => {
|
Ok(Some(ImplSource::UserDefined(_))) => {
|
||||||
debug!(
|
debug!(
|
||||||
|
|
|
@ -1272,7 +1272,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
||||||
// the master cache. Since coherence executes pretty quickly,
|
// the master cache. Since coherence executes pretty quickly,
|
||||||
// it's not worth going to more trouble to increase the
|
// it's not worth going to more trouble to increase the
|
||||||
// hit-rate, I don't think.
|
// hit-rate, I don't think.
|
||||||
if self.intercrate || self.allow_negative_impls {
|
if self.intercrate {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1289,7 +1289,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
||||||
// mode, so don't do any caching. In particular, we might
|
// mode, so don't do any caching. In particular, we might
|
||||||
// re-use the same `InferCtxt` with both an intercrate
|
// re-use the same `InferCtxt` with both an intercrate
|
||||||
// and non-intercrate `SelectionContext`
|
// and non-intercrate `SelectionContext`
|
||||||
if self.intercrate || self.allow_negative_impls {
|
if self.intercrate {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let tcx = self.tcx();
|
let tcx = self.tcx();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue