From b06f1c0087760fc15978938fa004a53c0cf9178b Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 30 Aug 2018 17:08:14 -0700
Subject: [PATCH] refactor(ivy): remove duplicate global (#25756)

PR Close #25756
---
 packages/core/src/render3/instructions.ts                  | 7 +------
 .../core/test/bundling/todo/bundle.golden_symbols.json     | 3 ---
 .../core/test/bundling/todo_r2/bundle.golden_symbols.json  | 3 ---
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/core/src/render3/instructions.ts b/packages/core/src/render3/instructions.ts
index d1da57dbde..60e6f4e482 100644
--- a/packages/core/src/render3/instructions.ts
+++ b/packages/core/src/render3/instructions.ts
@@ -97,8 +97,6 @@ export function getRendererFactory(): RendererFactory3 {
   return rendererFactory;
 }
 
-let currentElementNode: LElementNode|null = null;
-
 export function getCurrentSanitizer(): Sanitizer|null {
   return viewData && viewData[SANITIZER];
 }
@@ -797,7 +795,6 @@ export function elementStart(
 
   const node: LElementNode =
       createLNode(index, TNodeType.Element, native !, name, attrs || null, null);
-  currentElementNode = node;
 
   if (attrs) {
     setUpAttributes(native, attrs);
@@ -1311,7 +1308,6 @@ export function elementEnd(): void {
   ngDevMode && assertNodeType(previousOrParentNode, TNodeType.Element);
   currentQueries && (currentQueries = currentQueries.addNode(previousOrParentNode));
   queueLifecycleHooks(previousOrParentNode.tNode.flags, tView);
-  currentElementNode = null;
   elementDepthCount--;
 }
 
@@ -1514,8 +1510,7 @@ export function elementStyling<T>(
     classDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
     styleDeclarations?: (string | boolean | InitialStylingFlags)[] | null,
     styleSanitizer?: StyleSanitizeFn | null): void {
-  const lElement = currentElementNode !;
-  const tNode = lElement.tNode;
+  const tNode = previousOrParentNode.tNode;
   if (!tNode.stylingTemplate) {
     // initialize the styling template.
     tNode.stylingTemplate =
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 3529edde2a..3c4558479d 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -431,9 +431,6 @@
   {
     "name": "createViewQuery"
   },
-  {
-    "name": "currentElementNode"
-  },
   {
     "name": "defineComponent"
   },
diff --git a/packages/core/test/bundling/todo_r2/bundle.golden_symbols.json b/packages/core/test/bundling/todo_r2/bundle.golden_symbols.json
index f11c174565..acac7f9ec7 100644
--- a/packages/core/test/bundling/todo_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo_r2/bundle.golden_symbols.json
@@ -1316,9 +1316,6 @@
   {
     "name": "createViewQuery"
   },
-  {
-    "name": "currentElementNode"
-  },
   {
     "name": "dateGetter"
   },