Add cache to instantiateType function to break cycles

ahejlsberg · ahejlsberg · commit de8597ca8c31 · 2015-05-20T16:30:50.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3866,6 +3866,19 @@ module ts {
         }
 
         function instantiateAnonymousType(type: ObjectType, mapper: TypeMapper): ObjectType {
+            // If this type has already been instantiated using this mapper, returned the cached result. This guards against
+            // infinite instantiations of cyclic types, e.g. "var x: { a: T, b: typeof x };"
+            if (mapper.mappings) {
+                for (let mapping of mapper.mappings) {
+                    if (mapping.type === type) {
+                        return mapping.result;
+                    }
+                }
+            }
+            else {
+                mapper.mappings = [];
+            }
+            // Instantiate the given type using the given mapper and cache the result
             let result = <ResolvedType>createObjectType(TypeFlags.Anonymous, type.symbol);
             result.properties = instantiateList(getPropertiesOfObjectType(type), mapper, instantiateSymbol);
             result.members = createSymbolTable(result.properties);
@@ -3875,6 +3888,7 @@ module ts {
             let numberIndexType = getIndexTypeOfType(type, IndexKind.Number);
             if (stringIndexType) result.stringIndexType = instantiateType(stringIndexType, mapper);
             if (numberIndexType) result.numberIndexType = instantiateType(numberIndexType, mapper);
+            mapper.mappings.push({ type, result });
             return result;
         }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1586,9 +1586,15 @@ module ts {
         Number,
     }
 
+    export interface TypeMapping {
+        type: Type;
+        result: Type;
+    }
+
     /* @internal */
     export interface TypeMapper {
         (t: TypeParameter): Type;
+        mappings?: TypeMapping[];  // Type mapping cache
     }
 
     /* @internal */

Original file line number	Diff line number	Diff line change
`@@ -1586,9 +1586,15 @@ module ts {`
`1586`	`1586`	`Number,`
`1587`	`1587`	`}`
`1588`	`1588`
	`1589`	`+ export interface TypeMapping {`
	`1590`	`+ type: Type;`
	`1591`	`+ result: Type;`
	`1592`	`+ }`
	`1593`	`+`
`1589`	`1594`	`/* @internal */`
`1590`	`1595`	`export interface TypeMapper {`
`1591`	`1596`	`(t: TypeParameter): Type;`
	`1597`	`+ mappings?: TypeMapping[]; // Type mapping cache`
`1592`	`1598`	`}`
`1593`	`1599`
`1594`	`1600`	`/* @internal */`