Skip to content

Commit 01dea4b

Browse files
committed
Consolidate names
1 parent 0580cca commit 01dea4b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/compiler/checker.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8564,9 +8564,9 @@ namespace ts {
85648564
return instantiateSignature(signature, createTypeEraser(signature.typeParameters!), /*eraseTypeParameters*/ true);
85658565
}
85668566

8567-
function getConstrainedSignature(signature: Signature): Signature {
8567+
function getBaseSignature(signature: Signature): Signature {
85688568
return signature.typeParameters ?
8569-
signature.constrainedSignatureCache || (signature.constrainedSignatureCache = getBaseSignature(signature)) :
8569+
signature.baseSignatureCache || (signature.baseSignatureCache = createBaseSignature(signature)) :
85708570
signature;
85718571
}
85728572

@@ -8589,7 +8589,7 @@ namespace ts {
85898589
isInJSFile(signature.declaration));
85908590
}
85918591

8592-
function getBaseSignature(signature: Signature) {
8592+
function createBaseSignature(signature: Signature) {
85938593
const typeParameters = signature.typeParameters;
85948594
if (typeParameters) {
85958595
const typeEraser = createTypeEraser(typeParameters);
@@ -13922,8 +13922,8 @@ namespace ts {
1392213922
}
1392313923
// Spec 1.0 Section 3.8.3 & 3.8.4:
1392413924
// M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
13925-
source = getConstrainedSignature(source);
13926-
target = getConstrainedSignature(target);
13925+
source = getBaseSignature(source);
13926+
target = getBaseSignature(target);
1392713927
let result = Ternary.True;
1392813928

1392913929
if (!ignoreThisTypes) {

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4383,7 +4383,7 @@ namespace ts {
43834383
/* @internal */
43844384
erasedSignatureCache?: Signature; // Erased version of signature (to any) (deferred)
43854385
/* @internal */
4386-
constrainedSignatureCache?: Signature; // Erased version of signature (to constraints) (deferred)
4386+
baseSignatureCache?: Signature; // Erased version of signature (to constraints) (deferred)
43874387
/* @internal */
43884388
canonicalSignatureCache?: Signature; // Canonical version of signature (deferred)
43894389
/* @internal */

0 commit comments

Comments
 (0)