bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix perf issue for auto trait selection

Browse source
This commit is contained in:
Guillaume Gomez 2022-03-26 14:58:19 +01:00
parent 3fe3b89cd5
commit ad88732254
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_trait_selection/src/traits/auto_trait.rs
View file

@ -94,6 +94,24 @@ impl<'tcx> AutoTraitFinder<'tcx> {
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 {
Ok(Some(ImplSource::UserDefined(_))) => {
debug!(

4
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -1272,7 +1272,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// the master cache. Since coherence executes pretty quickly,
// it's not worth going to more trouble to increase the
// hit-rate, I don't think.
if self.intercrate || self.allow_negative_impls {
if self.intercrate {
return false;
}
@ -1289,7 +1289,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// mode, so don't do any caching. In particular, we might
// re-use the same `InferCtxt` with both an intercrate
// and non-intercrate `SelectionContext`
if self.intercrate || self.allow_negative_impls {
if self.intercrate {
return None;
}
let tcx = self.tcx();