Auto merge of #114611 - nnethercote:type-system-chess, r=compiler-errors
Speed up compilation of `type-system-chess` [`type-system-chess`](https://github.com/rust-lang/rustc-perf/pull/1680) is an unusual program that implements a compile-time chess position solver in the trait system(!) This PR is about making it compile faster. r? `@ghost`
This commit is contained in:
commit
a1e1dba9cc
2 changed files with 27 additions and 10 deletions
|
@ -1214,7 +1214,7 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
|
|||
|
||||
let projected_term = selcx.infcx.resolve_vars_if_possible(projected_term);
|
||||
|
||||
let mut result = if projected_term.has_projections() {
|
||||
let result = if projected_term.has_projections() {
|
||||
let mut normalizer = AssocTypeNormalizer::new(
|
||||
selcx,
|
||||
param_env,
|
||||
|
@ -1224,19 +1224,14 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
|
|||
);
|
||||
let normalized_ty = normalizer.fold(projected_term);
|
||||
|
||||
let mut deduped = SsoHashSet::with_capacity(projected_obligations.len());
|
||||
projected_obligations.retain(|obligation| deduped.insert(obligation.clone()));
|
||||
|
||||
Normalized { value: normalized_ty, obligations: projected_obligations }
|
||||
} else {
|
||||
Normalized { value: projected_term, obligations: projected_obligations }
|
||||
};
|
||||
|
||||
let mut deduped: SsoHashSet<_> = Default::default();
|
||||
result.obligations.retain(|projected_obligation| {
|
||||
if !deduped.insert(projected_obligation.clone()) {
|
||||
return false;
|
||||
}
|
||||
true
|
||||
});
|
||||
|
||||
if use_cache {
|
||||
infcx.inner.borrow_mut().projection_cache().insert_term(cache_key, result.clone());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue