Skip to content

Fix runaway recursion in object type member resolution #25336

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.

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

Merged
merged 5 commits into from
Jul 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 18 additions & 13 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2608,6 +2608,12 @@ namespace ts {
const type = <ObjectType>createType(TypeFlags.Object);
type.objectFlags = objectFlags;
type.symbol = symbol!;
type.members = undefined;
type.properties = undefined;
type.callSignatures = undefined;
type.constructSignatures = undefined;
type.stringIndexInfo = undefined;
type.numberIndexInfo = undefined;
return type;
}

Expand All @@ -2629,23 +2635,20 @@ namespace ts {
function getNamedMembers(members: SymbolTable): Symbol[] {
let result: Symbol[] | undefined;
members.forEach((symbol, id) => {
if (!isReservedMemberName(id)) {
if (!result) result = [];
if (symbolIsValue(symbol)) {
result.push(symbol);
}
if (!isReservedMemberName(id) && symbolIsValue(symbol)) {
(result || (result = [])).push(symbol);
}
});
return result || emptyArray;
}

function setStructuredTypeMembers(type: StructuredType, members: SymbolTable, callSignatures: ReadonlyArray<Signature>, constructSignatures: ReadonlyArray<Signature>, stringIndexInfo: IndexInfo | undefined, numberIndexInfo: IndexInfo | undefined): ResolvedType {
(<ResolvedType>type).members = members;
(<ResolvedType>type).properties = getNamedMembers(members);
(<ResolvedType>type).properties = members === emptySymbols ? emptyArray : getNamedMembers(members);
(<ResolvedType>type).callSignatures = callSignatures;
(<ResolvedType>type).constructSignatures = constructSignatures;
if (stringIndexInfo) (<ResolvedType>type).stringIndexInfo = stringIndexInfo;
if (numberIndexInfo) (<ResolvedType>type).numberIndexInfo = numberIndexInfo;
(<ResolvedType>type).stringIndexInfo = stringIndexInfo;
(<ResolvedType>type).numberIndexInfo = numberIndexInfo;
return <ResolvedType>type;
}

Expand Down Expand Up @@ -5514,7 +5517,7 @@ namespace ts {
// (otherwise there'd be an error from hasBaseType) - this is fine, but `.members` should be reset
// as `getIndexedAccessType` via `instantiateType` via `getTypeFromClassOrInterfaceReference` forces a
// partial instantiation of the members without the base types fully resolved
(type as Type as ResolvedType).members = undefined!; // TODO: GH#18217
type.members = undefined;
}
return type.resolvedBaseTypes = [baseType];
}
Expand Down Expand Up @@ -6444,6 +6447,7 @@ namespace ts {
function resolveAnonymousTypeMembers(type: AnonymousType) {
const symbol = type.symbol;
if (type.target) {
setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
const members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper!, /*mappingThisOnly*/ false);
const callSignatures = instantiateSignatures(getSignaturesOfType(type.target, SignatureKind.Call), type.mapper!);
const constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, SignatureKind.Construct), type.mapper!);
Expand All @@ -6452,6 +6456,7 @@ namespace ts {
setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
}
else if (symbol.flags & SymbolFlags.TypeLiteral) {
setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
const members = getMembersOfSymbol(symbol);
const callSignatures = getSignaturesOfSymbol(members.get(InternalSymbolName.Call));
const constructSignatures = getSignaturesOfSymbol(members.get(InternalSymbolName.New));
Expand Down Expand Up @@ -6485,7 +6490,7 @@ namespace ts {
// in the process of resolving (see issue #6072). The temporarily empty signature list
// will never be observed because a qualified name can't reference signatures.
if (symbol.flags & (SymbolFlags.Function | SymbolFlags.Method)) {
(<ResolvedType>type).callSignatures = getSignaturesOfSymbol(symbol);
type.callSignatures = getSignaturesOfSymbol(symbol);
}
// And likewise for construct signatures for classes
if (symbol.flags & SymbolFlags.Class) {
Expand All @@ -6494,7 +6499,7 @@ namespace ts {
if (!constructSignatures.length) {
constructSignatures = getDefaultConstructSignatures(classType);
}
(<ResolvedType>type).constructSignatures = constructSignatures;
type.constructSignatures = constructSignatures;
}
}
}
Expand Down Expand Up @@ -7674,7 +7679,7 @@ namespace ts {
// will result in a different declaration kind.
if (!signature.isolatedSignatureType) {
const isConstructor = signature.declaration!.kind === SyntaxKind.Constructor || signature.declaration!.kind === SyntaxKind.ConstructSignature; // TODO: GH#18217
const type = <ResolvedType>createObjectType(ObjectFlags.Anonymous);
const type = createObjectType(ObjectFlags.Anonymous);
type.members = emptySymbols;
type.properties = emptyArray;
type.callSignatures = !isConstructor ? [signature] : emptyArray;
Expand Down Expand Up @@ -10110,7 +10115,7 @@ namespace ts {
if (type.flags & TypeFlags.Object) {
const resolved = resolveStructuredTypeMembers(<ObjectType>type);
if (resolved.constructSignatures.length) {
const result = <ResolvedType>createObjectType(ObjectFlags.Anonymous, type.symbol);
const result = createObjectType(ObjectFlags.Anonymous, type.symbol);
result.members = resolved.members;
result.properties = resolved.properties;
result.callSignatures = emptyArray;
Expand Down
8 changes: 6 additions & 2 deletions src/compiler/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3820,6 +3820,12 @@ namespace ts {
// Object types (TypeFlags.ObjectType)
export interface ObjectType extends Type {
objectFlags: ObjectFlags;
/* @internal */ members?: SymbolTable; // Properties by name
/* @internal */ properties?: Symbol[]; // Properties
/* @internal */ callSignatures?: ReadonlyArray<Signature>; // Call signatures of type
/* @internal */ constructSignatures?: ReadonlyArray<Signature>; // Construct signatures of type
/* @internal */ stringIndexInfo?: IndexInfo; // String indexing info
/* @internal */ numberIndexInfo?: IndexInfo; // Numeric indexing info
}

/** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */
Expand Down Expand Up @@ -3946,8 +3952,6 @@ namespace ts {
properties: Symbol[]; // Properties
callSignatures: ReadonlyArray<Signature>; // Call signatures of type
constructSignatures: ReadonlyArray<Signature>; // Construct signatures of type
stringIndexInfo?: IndexInfo; // String indexing info
numberIndexInfo?: IndexInfo; // Numeric indexing info
}

/* @internal */
Expand Down
8 changes: 6 additions & 2 deletions tests/baselines/reference/api/tsserverlibrary.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3312,6 +3312,12 @@ declare namespace ts {
}
interface ObjectType extends Type {
objectFlags: ObjectFlags;
members?: SymbolTable;
properties?: Symbol[];
callSignatures?: ReadonlyArray<Signature>;
constructSignatures?: ReadonlyArray<Signature>;
stringIndexInfo?: IndexInfo;
numberIndexInfo?: IndexInfo;
}
/** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */
interface InterfaceType extends ObjectType {
Expand Down Expand Up @@ -3402,8 +3408,6 @@ declare namespace ts {
properties: Symbol[];
callSignatures: ReadonlyArray<Signature>;
constructSignatures: ReadonlyArray<Signature>;
stringIndexInfo?: IndexInfo;
numberIndexInfo?: IndexInfo;
}
interface FreshObjectLiteralType extends ResolvedType {
regularType: ResolvedType;
Expand Down
19 changes: 19 additions & 0 deletions tests/baselines/reference/recursiveResolveTypeMembers.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
tests/cases/compiler/recursiveResolveTypeMembers.ts(4,58): error TS2304: Cannot find name 'H'.
tests/cases/compiler/recursiveResolveTypeMembers.ts(4,62): error TS2574: A rest element type must be an array type.
tests/cases/compiler/recursiveResolveTypeMembers.ts(4,79): error TS2304: Cannot find name 'R'.


==== tests/cases/compiler/recursiveResolveTypeMembers.ts (3 errors) ====
// Repro from #25291

type PromisedTuple<L extends any[], U = (...args: L) => void> =
U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []
~
!!! error TS2304: Cannot find name 'H'.
~~~~~~~~~~~~~~~~~~~
!!! error TS2574: A rest element type must be an array type.
~
!!! error TS2304: Cannot find name 'R'.

type Promised = PromisedTuple<[1, 2, 3]>

11 changes: 11 additions & 0 deletions tests/baselines/reference/recursiveResolveTypeMembers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//// [recursiveResolveTypeMembers.ts]
// Repro from #25291

type PromisedTuple<L extends any[], U = (...args: L) => void> =
U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []

type Promised = PromisedTuple<[1, 2, 3]>


//// [recursiveResolveTypeMembers.js]
// Repro from #25291
23 changes: 23 additions & 0 deletions tests/baselines/reference/recursiveResolveTypeMembers.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
=== tests/cases/compiler/recursiveResolveTypeMembers.ts ===
// Repro from #25291

type PromisedTuple<L extends any[], U = (...args: L) => void> =
>PromisedTuple : Symbol(PromisedTuple, Decl(recursiveResolveTypeMembers.ts, 0, 0))
>L : Symbol(L, Decl(recursiveResolveTypeMembers.ts, 2, 19))
>U : Symbol(U, Decl(recursiveResolveTypeMembers.ts, 2, 35))
>args : Symbol(args, Decl(recursiveResolveTypeMembers.ts, 2, 41))
>L : Symbol(L, Decl(recursiveResolveTypeMembers.ts, 2, 19))

U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []
>U : Symbol(U, Decl(recursiveResolveTypeMembers.ts, 2, 35))
>h : Symbol(h, Decl(recursiveResolveTypeMembers.ts, 3, 15))
>H : Symbol(H, Decl(recursiveResolveTypeMembers.ts, 3, 23))
>args : Symbol(args, Decl(recursiveResolveTypeMembers.ts, 3, 26))
>R : Symbol(R, Decl(recursiveResolveTypeMembers.ts, 3, 41))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
>PromisedTuple : Symbol(PromisedTuple, Decl(recursiveResolveTypeMembers.ts, 0, 0))

type Promised = PromisedTuple<[1, 2, 3]>
>Promised : Symbol(Promised, Decl(recursiveResolveTypeMembers.ts, 3, 91))
>PromisedTuple : Symbol(PromisedTuple, Decl(recursiveResolveTypeMembers.ts, 0, 0))

25 changes: 25 additions & 0 deletions tests/baselines/reference/recursiveResolveTypeMembers.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
=== tests/cases/compiler/recursiveResolveTypeMembers.ts ===
// Repro from #25291

type PromisedTuple<L extends any[], U = (...args: L) => void> =
>PromisedTuple : PromisedTuple<L, U>
>L : L
>U : U
>args : L
>L : L

U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []
>U : U
>h : H
>H : H
>args : R
>R : R
>Promise : Promise<T>
>H : No type information available!
>PromisedTuple : PromisedTuple<L, U>
>R : No type information available!

type Promised = PromisedTuple<[1, 2, 3]>
>Promised : []
>PromisedTuple : PromisedTuple<L, U>

6 changes: 6 additions & 0 deletions tests/cases/compiler/recursiveResolveTypeMembers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Repro from #25291

type PromisedTuple<L extends any[], U = (...args: L) => void> =
U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []

type Promised = PromisedTuple<[1, 2, 3]>