From 1841afeaa2254ee32d50ac49d2f27e6ad8e3ccb8 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Wed, 27 Sep 2017 17:31:32 -0700
Subject: [PATCH] Ensure that the import helper is checked for tagged
 templates, and update its name.

---
 src/compiler/checker.ts | 4 ++--
 src/compiler/types.ts   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/compiler/checker.ts
 mode change 100644 => 100755 src/compiler/types.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
old mode 100644
new mode 100755
index bf01b5fe940..0e5b8e2cf8d
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -16665,7 +16665,7 @@ namespace ts {
 
         function checkTaggedTemplateExpression(node: TaggedTemplateExpression): Type {
             if (languageVersion < ScriptTarget.ES2015) {
-                checkExternalEmitHelpers(node, ExternalEmitHelpers.GetTemplateObject);
+                checkExternalEmitHelpers(node, ExternalEmitHelpers.MakeTemplateObject);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -24032,7 +24032,7 @@ namespace ts {
                 case ExternalEmitHelpers.AsyncDelegator: return "__asyncDelegator";
                 case ExternalEmitHelpers.AsyncValues: return "__asyncValues";
                 case ExternalEmitHelpers.ExportStar: return "__exportStar";
-                case ExternalEmitHelpers.GetTemplateObject: return "__getTemplateObject";
+                case ExternalEmitHelpers.MakeTemplateObject: return "__makeTemplateObject";
                 default: Debug.fail("Unrecognized helper");
             }
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
old mode 100644
new mode 100755
index 7de5e955e47..5d0b2d66045
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -4287,7 +4287,8 @@ namespace ts {
         AsyncDelegator = 1 << 13,       // __asyncDelegator (used by ES2017 async generator yield* transformation)
         AsyncValues = 1 << 14,          // __asyncValues (used by ES2017 for..await..of transformation)
         ExportStar = 1 << 15,           // __exportStar (used by CommonJS/AMD/UMD module transformation)
-        GetTemplateObject = 1 << 16,    // __getTemplateObject (used for constructing template string array objects)
+        MakeTemplateObject = 1 << 16,   // __makeTemplateObject (used for constructing template string array objects)
+        " LastPlusOne",
 
         // Helpers included by ES2015 for..of
         ForOfIncludes = Values,
@@ -4305,7 +4306,7 @@ namespace ts {
         SpreadIncludes = Read | Spread,
 
         FirstEmitHelper = Extends,
-        LastEmitHelper = ExportStar
+        LastEmitHelper = ExternalEmitHelpers[" LastPlusOne"] - 1
     }
 
     export const enum EmitHint {