Skip to content

Cache multiple relationship comparisons based on one relationship comparison result #36667

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

Cache multiple relationship comparisons based on one relationship comparison result #36667

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
43 changes: 43 additions & 0 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ namespace ts {
None = 0,
Source = 1 << 0,
Target = 1 << 1,

Both = Source | Target,
}

const enum MappedTypeModifiers {
Expand Down Expand Up @@ -15582,6 +15584,27 @@ namespace ts {
depth--;
if (result) {
if (result === Ternary.True || depth === 0) {
// IntersectionState.Target _disables_ excess and common property checking on the target
// IntersectionState.Source _disables_ inferable index relating on the source
// This means if a type is assignable with none of these set, it should be assignable with either
// or both set
if (intersectionState === IntersectionState.None) {
const keys = [
getRelationKey(source, target, IntersectionState.Both, relation),
getRelationKey(source, target, IntersectionState.Target, relation),
getRelationKey(source, target, IntersectionState.Source, relation)
];
for (const k of keys) {
if (relation.has(k)) continue;
relation.set(k, RelationComparisonResult.Succeeded | propagatingVarianceFlags);
}
}
else if (intersectionState !== IntersectionState.Both) {
const k = getRelationKey(source, target, IntersectionState.Both, relation);
if (!relation.has(k)) {
relation.set(k, RelationComparisonResult.Succeeded | propagatingVarianceFlags);
}
}
// If result is definitely true, record all maybe keys as having succeeded
for (let i = maybeStart; i < maybeCount; i++) {
relation.set(maybeKeys[i], RelationComparisonResult.Succeeded | propagatingVarianceFlags);
Expand All @@ -15594,6 +15617,26 @@ namespace ts {
// assumptions it will also be false without assumptions)
relation.set(id, (reportErrors ? RelationComparisonResult.Reported : 0) | RelationComparisonResult.Failed | propagatingVarianceFlags);
maybeCount = maybeStart;

// similarly to the success case, if a type _is not_ assignable with IntersectionState.Both set,
// then it's impossible for it to have been assignable in any of the stronger modes, too
if (intersectionState === IntersectionState.Both) {
const keys = [
getRelationKey(source, target, IntersectionState.None, relation),
getRelationKey(source, target, IntersectionState.Target, relation),
getRelationKey(source, target, IntersectionState.Source, relation)
];
for (const k of keys) {
if (relation.has(k)) continue;
relation.set(k, RelationComparisonResult.Failed | propagatingVarianceFlags);
}
}
else if (intersectionState !== IntersectionState.None) {
const k = getRelationKey(source, target, IntersectionState.None, relation);
if (!relation.has(k)) {
relation.set(k, RelationComparisonResult.Failed | propagatingVarianceFlags);
}
}
}
return result;
}
Expand Down