microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 11:24:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Reset type resolution stack when starting to compute variance (#53549)

Browse Source
This commit is contained in:
Gabriela Araujo Britto
2023-04-11 18:05:31 -03:00
committed by GitHub
parent 23469e9cb3
commit 2db688e36f
11 changed files with 233 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/checker.ts
View File

@@ -2157,6 +2157,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
var resolutionTargets: TypeSystemEntity[] = [];
var resolutionResults: boolean[] = [];
var resolutionPropertyNames: TypeSystemPropertyName[] = [];
var resolutionStart = 0;
var inVarianceComputation = false;
var suggestionCount = 0;
var maximumSuggestionCount = 10;
@@ -10106,7 +10108,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
function findResolutionCycleStartIndex(target: TypeSystemEntity, propertyName: TypeSystemPropertyName): number {
for (let i = resolutionTargets.length - 1; i >= 0; i--) {
for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
return -1;
}
@@ -22689,6 +22691,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const links = getSymbolLinks(symbol);
if (!links.variances) {
tracing?.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
const oldVarianceComputation = inVarianceComputation;
if (!inVarianceComputation) {
inVarianceComputation = true;
resolutionStart = resolutionTargets.length;
}
links.variances = emptyArray;
const variances = [];
for (const tp of typeParameters) {
@@ -22727,6 +22734,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
variances.push(variance);
}
if (!oldVarianceComputation) {
inVarianceComputation = false;
resolutionStart = 0;
}
links.variances = variances;
tracing?.pop({ variances: variances.map(Debug.formatVariance) });
}