From 80963baf509fd7f22b81f13da3aa6b3840312c97 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 9 Aug 2016 15:37:15 -0700
Subject: [PATCH] Always use thisType when generating tuple id

---
 src/compiler/checker.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1ed8cb8c6ee..8fcd22f0ffb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1538,8 +1538,8 @@ namespace ts {
 
         function createType(flags: TypeFlags): Type {
             const result = new Type(checker, flags);
-            result.id = typeCount;
             typeCount++;
+            result.id = typeCount;
             return result;
         }
 
@@ -5235,11 +5235,7 @@ namespace ts {
         }
 
         function createTupleType(elementTypes: Type[], thisType?: Type) {
-            let id = getTypeListId(elementTypes);
-            if (thisType) {
-                id += ',' + thisType.id;
-            }
-
+            const id = getTypeListId(elementTypes) + ',' + (thisType ? thisType.id : 0);
             return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes, thisType));
         }