Skip to content

Commit 30e7a18

Browse files
committed
Removing cache as it doesn't seem to matter much
1 parent ce9ddf3 commit 30e7a18

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/compiler/checker.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -13560,14 +13560,8 @@ namespace ts {
1356013560
return mapper.func(type);
1356113561
case TypeMapKind.Composite:
1356213562
case TypeMapKind.Merged:
13563-
if (type === mapper.cachedSource) return mapper.cachedTarget;
1356413563
const t1 = getMappedType(type, mapper.mapper1);
13565-
const t2 = t1 !== type && mapper.kind === TypeMapKind.Composite ? instantiateType(t1, mapper.mapper2) : getMappedType(t1, mapper.mapper2);
13566-
if (t2 !== type) {
13567-
mapper.cachedSource = type;
13568-
mapper.cachedTarget = t2;
13569-
}
13570-
return t2;
13564+
return t1 !== type && mapper.kind === TypeMapKind.Composite ? instantiateType(t1, mapper.mapper2) : getMappedType(t1, mapper.mapper2);
1357113565
}
1357213566
}
1357313567

@@ -13584,7 +13578,7 @@ namespace ts {
1358413578
}
1358513579

1358613580
function makeCompositeTypeMapper(kind: TypeMapKind.Composite | TypeMapKind.Merged, mapper1: TypeMapper, mapper2: TypeMapper): TypeMapper {
13587-
return { kind, mapper1, mapper2, cachedSource: undefined!, cachedTarget: undefined! };
13581+
return { kind, mapper1, mapper2 };
1358813582
}
1358913583

1359013584
function createTypeEraser(sources: readonly TypeParameter[]): TypeMapper {

src/compiler/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4888,7 +4888,7 @@ namespace ts {
48884888
| { kind: TypeMapKind.Simple, source: Type, target: Type }
48894889
| { kind: TypeMapKind.Array, sources: readonly Type[], targets: readonly Type[] | undefined }
48904890
| { kind: TypeMapKind.Function, func: (t: Type) => Type }
4891-
| { kind: TypeMapKind.Composite | TypeMapKind.Merged, mapper1: TypeMapper, mapper2: TypeMapper, cachedSource: Type, cachedTarget: Type };
4891+
| { kind: TypeMapKind.Composite | TypeMapKind.Merged, mapper1: TypeMapper, mapper2: TypeMapper };
48924892

48934893
export const enum InferencePriority {
48944894
NakedTypeVariable = 1 << 0, // Naked type variable in union or intersection type

0 commit comments

Comments
 (0)