Skip to content

Fix stack overflow with recursive tuple types #4509

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

Merged
ahejlsberg merged 3 commits into from
Aug 27, 2015
Merged

Fix stack overflow with recursive tuple types #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98de9de
No deduplication in union of tuple element types
ahejlsberg Aug 27, 2015
1b08f8a
Adding tests
ahejlsberg Aug 27, 2015
e6dc58e
Accepting new baselines
ahejlsberg Aug 27, 2015
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
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3119,7 +3119,7 @@ namespace ts {
}

function resolveTupleTypeMembers(type: TupleType) {
let arrayType = resolveStructuredTypeMembers(createArrayType(getUnionType(type.elementTypes)));
let arrayType = resolveStructuredTypeMembers(createArrayType(getUnionType(type.elementTypes, /*noDeduplication*/ true)));
let members = createTupleTypeMemberSymbols(type.elementTypes);
addInheritedMembers(members, arrayType.properties);
setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
Expand Down
20 changes: 20 additions & 0 deletions tests/baselines/reference/recursiveTupleTypes1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//// [recursiveTupleTypes1.ts]
interface Tree1 {
children: [Tree1, Tree2];
}

interface Tree2 {
children: [Tree2, Tree1];
}

let tree1: Tree1;
let tree2: Tree2;
tree1 = tree2;
tree2 = tree1;


//// [recursiveTupleTypes1.js]
var tree1;
var tree2;
tree1 = tree2;
tree2 = tree1;
35 changes: 35 additions & 0 deletions tests/baselines/reference/recursiveTupleTypes1.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
=== tests/cases/compiler/recursiveTupleTypes1.ts ===
interface Tree1 {
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))

children: [Tree1, Tree2];
>children : Symbol(children, Decl(recursiveTupleTypes1.ts, 0, 17))
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))
}

interface Tree2 {
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))

children: [Tree2, Tree1];
>children : Symbol(children, Decl(recursiveTupleTypes1.ts, 4, 17))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))
}

let tree1: Tree1;
>tree1 : Symbol(tree1, Decl(recursiveTupleTypes1.ts, 8, 3))
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))

let tree2: Tree2;
>tree2 : Symbol(tree2, Decl(recursiveTupleTypes1.ts, 9, 3))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))

tree1 = tree2;
>tree1 : Symbol(tree1, Decl(recursiveTupleTypes1.ts, 8, 3))
>tree2 : Symbol(tree2, Decl(recursiveTupleTypes1.ts, 9, 3))

tree2 = tree1;
>tree2 : Symbol(tree2, Decl(recursiveTupleTypes1.ts, 9, 3))
>tree1 : Symbol(tree1, Decl(recursiveTupleTypes1.ts, 8, 3))

37 changes: 37 additions & 0 deletions tests/baselines/reference/recursiveTupleTypes1.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
=== tests/cases/compiler/recursiveTupleTypes1.ts ===
interface Tree1 {
>Tree1 : Tree1

children: [Tree1, Tree2];
>children : [Tree1, Tree2]
>Tree1 : Tree1
>Tree2 : Tree2
}

interface Tree2 {
>Tree2 : Tree2

children: [Tree2, Tree1];
>children : [Tree2, Tree1]
>Tree2 : Tree2
>Tree1 : Tree1
}

let tree1: Tree1;
>tree1 : Tree1
>Tree1 : Tree1

let tree2: Tree2;
>tree2 : Tree2
>Tree2 : Tree2

tree1 = tree2;
>tree1 = tree2 : Tree2
>tree1 : Tree1
>tree2 : Tree2

tree2 = tree1;
>tree2 = tree1 : Tree1
>tree2 : Tree2
>tree1 : Tree1

20 changes: 20 additions & 0 deletions tests/baselines/reference/recursiveTupleTypes2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//// [recursiveTupleTypes2.ts]
interface Tree1 {
children: [Tree1, Tree2];
}

interface Tree2 {
children: [Tree2, Tree2];
}

let tree1: Tree1;
let tree2: Tree2;
tree1 = tree2;
tree2 = tree1;


//// [recursiveTupleTypes2.js]
var tree1;
var tree2;
tree1 = tree2;
tree2 = tree1;
35 changes: 35 additions & 0 deletions tests/baselines/reference/recursiveTupleTypes2.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
=== tests/cases/compiler/recursiveTupleTypes2.ts ===
interface Tree1 {
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes2.ts, 0, 0))

children: [Tree1, Tree2];
>children : Symbol(children, Decl(recursiveTupleTypes2.ts, 0, 17))
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes2.ts, 0, 0))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
}

interface Tree2 {
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))

children: [Tree2, Tree2];
>children : Symbol(children, Decl(recursiveTupleTypes2.ts, 4, 17))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
}

let tree1: Tree1;
>tree1 : Symbol(tree1, Decl(recursiveTupleTypes2.ts, 8, 3))
>Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes2.ts, 0, 0))

let tree2: Tree2;
>tree2 : Symbol(tree2, Decl(recursiveTupleTypes2.ts, 9, 3))
>Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))

tree1 = tree2;
>tree1 : Symbol(tree1, Decl(recursiveTupleTypes2.ts, 8, 3))
>tree2 : Symbol(tree2, Decl(recursiveTupleTypes2.ts, 9, 3))

tree2 = tree1;
>tree2 : Symbol(tree2, Decl(recursiveTupleTypes2.ts, 9, 3))
>tree1 : Symbol(tree1, Decl(recursiveTupleTypes2.ts, 8, 3))

37 changes: 37 additions & 0 deletions tests/baselines/reference/recursiveTupleTypes2.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
=== tests/cases/compiler/recursiveTupleTypes2.ts ===
interface Tree1 {
>Tree1 : Tree1

children: [Tree1, Tree2];
>children : [Tree1, Tree2]
>Tree1 : Tree1
>Tree2 : Tree2
}

interface Tree2 {
>Tree2 : Tree2

children: [Tree2, Tree2];
>children : [Tree2, Tree2]
>Tree2 : Tree2
>Tree2 : Tree2
}

let tree1: Tree1;
>tree1 : Tree1
>Tree1 : Tree1

let tree2: Tree2;
>tree2 : Tree2
>Tree2 : Tree2

tree1 = tree2;
>tree1 = tree2 : Tree2
>tree1 : Tree1
>tree2 : Tree2

tree2 = tree1;
>tree2 = tree1 : Tree1
>tree2 : Tree2
>tree1 : Tree1

12 changes: 12 additions & 0 deletions tests/cases/compiler/recursiveTupleTypes1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
interface Tree1 {
children: [Tree1, Tree2];
}

interface Tree2 {
children: [Tree2, Tree1];
}

let tree1: Tree1;
let tree2: Tree2;
tree1 = tree2;
tree2 = tree1;
12 changes: 12 additions & 0 deletions tests/cases/compiler/recursiveTupleTypes2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
interface Tree1 {
children: [Tree1, Tree2];
}

interface Tree2 {
children: [Tree2, Tree2];
}

let tree1: Tree1;
let tree2: Tree2;
tree1 = tree2;
tree2 = tree1;