refactor(ivy): remove interpolation instructions (#31395)

Makes the `interpolateX` instructions internal-only and removes their use of global state.

This PR resolves FW-1387.

PR Close #31395

packages/compiler/src/render3/r3_identifiers.ts

@@ -149,16 +149,6 @@ export class Identifiers {
 
   static restoreView: o.ExternalReference = {name: 'ɵɵrestoreView', moduleName: CORE};
 
-  static interpolation1: o.ExternalReference = {name: 'ɵɵinterpolation1', moduleName: CORE};
-  static interpolation2: o.ExternalReference = {name: 'ɵɵinterpolation2', moduleName: CORE};
-  static interpolation3: o.ExternalReference = {name: 'ɵɵinterpolation3', moduleName: CORE};
-  static interpolation4: o.ExternalReference = {name: 'ɵɵinterpolation4', moduleName: CORE};
-  static interpolation5: o.ExternalReference = {name: 'ɵɵinterpolation5', moduleName: CORE};
-  static interpolation6: o.ExternalReference = {name: 'ɵɵinterpolation6', moduleName: CORE};
-  static interpolation7: o.ExternalReference = {name: 'ɵɵinterpolation7', moduleName: CORE};
-  static interpolation8: o.ExternalReference = {name: 'ɵɵinterpolation8', moduleName: CORE};
-  static interpolationV: o.ExternalReference = {name: 'ɵɵinterpolationV', moduleName: CORE};
-
   static pureFunction0: o.ExternalReference = {name: 'ɵɵpureFunction0', moduleName: CORE};
   static pureFunction1: o.ExternalReference = {name: 'ɵɵpureFunction1', moduleName: CORE};
   static pureFunction2: o.ExternalReference = {name: 'ɵɵpureFunction2', moduleName: CORE};

packages/core/src/core_render3_private_export.ts

@@ -69,15 +69,6 @@ export {
   ɵɵtextInterpolateV,
   ɵɵembeddedViewStart,
   ɵɵprojection,
-  ɵɵinterpolation1,
-  ɵɵinterpolation2,
-  ɵɵinterpolation3,
-  ɵɵinterpolation4,
-  ɵɵinterpolation5,
-  ɵɵinterpolation6,
-  ɵɵinterpolation7,
-  ɵɵinterpolation8,
-  ɵɵinterpolationV,
   ɵɵpipeBind1,
   ɵɵpipeBind2,
   ɵɵpipeBind3,

packages/core/src/render3/index.ts

@@ -70,16 +70,6 @@ export {
   ɵɵgetCurrentView,
   ɵɵinjectAttribute,
 
-  ɵɵinterpolation1,
-  ɵɵinterpolation2,
-  ɵɵinterpolation3,
-  ɵɵinterpolation4,
-  ɵɵinterpolation5,
-  ɵɵinterpolation6,
-  ɵɵinterpolation7,
-  ɵɵinterpolation8,
-  ɵɵinterpolationV,
-
   ɵɵlistener,
   ɵɵload,
 

packages/core/src/render3/instructions/all.ts

@@ -36,7 +36,6 @@ export * from './element';
 export * from './element_container';
 export * from './embedded_view';
 export * from './get_current_view';
-export * from './interpolation';
 export * from './listener';
 export * from './namespace';
 export * from './next_context';

packages/core/src/render3/instructions/attribute.ts

@@ -32,7 +32,6 @@ export function ɵɵattribute(
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const bound = bind(lView, value);
   if (bound !== NO_CHANGE) {
     elementAttributeInternal(index, name, bound, lView, sanitizer, namespace);

packages/core/src/render3/instructions/attribute_interpolation.ts

@@ -9,7 +9,7 @@ import {SanitizerFn} from '../interfaces/sanitization';
 import {getLView, getSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
 
-import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
 import {TsickleIssue1009, elementAttributeInternal} from './shared';
 
 
@@ -43,9 +43,7 @@ export function ɵɵattributeInterpolate1(
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
+  const interpolatedValue = interpolation1(lView, prefix, v0, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -83,9 +81,7 @@ export function ɵɵattributeInterpolate2(
     sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolatedValue = interpolation2(lView, prefix, v0, i0, v1, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -126,9 +122,7 @@ export function ɵɵattributeInterpolate3(
     suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolatedValue = interpolation3(lView, prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -171,9 +165,7 @@ export function ɵɵattributeInterpolate4(
     v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolatedValue = interpolation4(lView, prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -219,9 +211,8 @@ export function ɵɵattributeInterpolate5(
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolatedValue =
+      interpolation5(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -269,9 +260,8 @@ export function ɵɵattributeInterpolate6(
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+      interpolation6(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -321,9 +311,8 @@ export function ɵɵattributeInterpolate7(
     sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+      interpolation7(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -375,9 +364,8 @@ export function ɵɵattributeInterpolate8(
     suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue =
-      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  const interpolatedValue = interpolation8(
+      lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolatedValue, lView, sanitizer, namespace);
   }
@@ -415,8 +403,7 @@ export function ɵɵattributeInterpolateV(
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolated = ɵɵinterpolationV(values);
+  const interpolated = interpolationV(lView, values);
   if (interpolated !== NO_CHANGE) {
     elementAttributeInternal(index, attrName, interpolated, lView, sanitizer, namespace);
   }

packages/core/src/render3/instructions/class_map_interpolation.ts

@@ -6,11 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {getLView} from '../state';
 import {NO_CHANGE} from '../tokens';
 
-import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
 import {ɵɵclassMap} from './styling';
 
+
 /**
  *
  * Update an interpolated class on an element with single bound value surrounded by text.
@@ -34,7 +36,7 @@ import {ɵɵclassMap} from './styling';
  */
 export function ɵɵclassMapInterpolate1(prefix: string, v0: any, suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
+  const interpolatedValue = interpolation1(getLView(), prefix, v0, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -66,7 +68,7 @@ export function ɵɵclassMapInterpolate1(prefix: string, v0: any, suffix: string
 export function ɵɵclassMapInterpolate2(
     prefix: string, v0: any, i0: string, v1: any, suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolatedValue = interpolation2(getLView(), prefix, v0, i0, v1, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -101,7 +103,7 @@ export function ɵɵclassMapInterpolate2(
 export function ɵɵclassMapInterpolate3(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolatedValue = interpolation3(getLView(), prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -139,7 +141,7 @@ export function ɵɵclassMapInterpolate4(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolatedValue = interpolation4(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -179,7 +181,8 @@ export function ɵɵclassMapInterpolate5(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolatedValue =
+      interpolation5(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -222,7 +225,7 @@ export function ɵɵclassMapInterpolate6(
     i3: string, v4: any, i4: string, v5: any, suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+      interpolation6(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -266,8 +269,8 @@ export function ɵɵclassMapInterpolate7(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue =
-      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+  const interpolatedValue = interpolation7(
+      getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -314,8 +317,8 @@ export function ɵɵclassMapInterpolate8(
     i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue =
-      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  const interpolatedValue = interpolation8(
+      getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }
@@ -346,7 +349,7 @@ export function ɵɵclassMapInterpolate8(
  */
 export function ɵɵclassMapInterpolateV(values: any[]): void {
   // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolationV(values);
+  const interpolatedValue = interpolationV(getLView(), values);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵclassMap(interpolatedValue);
   }

packages/core/src/render3/instructions/interpolation.ts

@@ -8,11 +8,9 @@
 
 import {assertEqual, assertLessThan} from '../../util/assert';
 import {bindingUpdated, bindingUpdated2, bindingUpdated3, bindingUpdated4} from '../bindings';
-import {BINDING_INDEX, TVIEW} from '../interfaces/view';
-import {getLView} from '../state';
+import {BINDING_INDEX, LView, TVIEW} from '../interfaces/view';
 import {NO_CHANGE} from '../tokens';
 import {renderStringify} from '../util/misc_utils';
-
 import {storeBindingMetadata} from './shared';
 
 
@@ -28,14 +26,11 @@ import {storeBindingMetadata} from './shared';
  * - has evaluated expressions at odd indexes.
  *
  * Returns the concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
+export function interpolationV(lView: LView, values: any[]): string|NO_CHANGE {
   ngDevMode && assertLessThan(2, values.length, 'should have at least 3 values');
   ngDevMode && assertEqual(values.length % 2, 1, 'should have an odd number of values');
   let isBindingUpdated = false;
-  const lView = getLView();
   const tData = lView[TVIEW].data;
   let bindingIndex = lView[BINDING_INDEX];
 
@@ -73,11 +68,9 @@ export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
  * @param prefix static value used for concatenation only.
  * @param v0 value checked for change.
  * @param suffix static value used for concatenation only.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
+export function interpolation1(lView: LView, prefix: string, v0: any, suffix: string): string|
+    NO_CHANGE {
   const different = bindingUpdated(lView, lView[BINDING_INDEX]++, v0);
   storeBindingMetadata(lView, prefix, suffix);
   return different ? prefix + renderStringify(v0) + suffix : NO_CHANGE;
@@ -85,12 +78,9 @@ export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): str
 
 /**
  * Creates an interpolation binding with 2 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation2(
-    prefix: string, v0: any, i0: string, v1: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
+export function interpolation2(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, suffix: string): string|NO_CHANGE {
   const bindingIndex = lView[BINDING_INDEX];
   const different = bindingUpdated2(lView, bindingIndex, v0, v1);
   lView[BINDING_INDEX] += 2;
@@ -106,13 +96,10 @@ export function ɵɵinterpolation2(
 
 /**
  * Creates an interpolation binding with 3 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation3(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string|
-    NO_CHANGE {
-  const lView = getLView();
+export function interpolation3(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+    suffix: string): string|NO_CHANGE {
   const bindingIndex = lView[BINDING_INDEX];
   const different = bindingUpdated3(lView, bindingIndex, v0, v1, v2);
   lView[BINDING_INDEX] += 3;
@@ -132,13 +119,10 @@ export function ɵɵinterpolation3(
 
 /**
  * Create an interpolation binding with 4 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation4(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    suffix: string): string|NO_CHANGE {
-  const lView = getLView();
+export function interpolation4(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, suffix: string): string|NO_CHANGE {
   const bindingIndex = lView[BINDING_INDEX];
   const different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
   lView[BINDING_INDEX] += 4;
@@ -160,13 +144,10 @@ export function ɵɵinterpolation4(
 
 /**
  * Creates an interpolation binding with 5 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation5(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
+export function interpolation5(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, suffix: string): string|NO_CHANGE {
   const bindingIndex = lView[BINDING_INDEX];
   let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
   different = bindingUpdated(lView, bindingIndex + 4, v4) || different;
@@ -190,13 +171,10 @@ export function ɵɵinterpolation5(
 
 /**
  * Creates an interpolation binding with 6 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation6(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, i4: string, v5: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
+export function interpolation6(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string|NO_CHANGE {
   const bindingIndex = lView[BINDING_INDEX];
   let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
   different = bindingUpdated2(lView, bindingIndex + 4, v4, v5) || different;
@@ -221,14 +199,11 @@ export function ɵɵinterpolation6(
 
 /**
  * Creates an interpolation binding with 7 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation7(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string|
+export function interpolation7(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string|
     NO_CHANGE {
-  const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX];
   let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
   different = bindingUpdated3(lView, bindingIndex + 4, v4, v5, v6) || different;
@@ -255,14 +230,11 @@ export function ɵɵinterpolation7(
 
 /**
  * Creates an interpolation binding with 8 expressions.
- *
- * @codeGenApi
  */
-export function ɵɵinterpolation8(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
+export function interpolation8(
+    lView: LView, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string): string|NO_CHANGE {
-  const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX];
   let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
   different = bindingUpdated4(lView, bindingIndex + 4, v4, v5, v6, v7) || different;

packages/core/src/render3/instructions/property_interpolation.ts

@@ -6,13 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {SanitizerFn} from '../interfaces/sanitization';
-import {getSelectedIndex} from '../state';
+import {getLView, getSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
 
-import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
 import {TsickleIssue1009, elementPropertyInternal} from './shared';
 
 
+
 /**
  *
  * Update an interpolated property on an element with a lone bound value
@@ -81,7 +82,7 @@ export function ɵɵpropertyInterpolate1(
     propName: string, prefix: string, v0: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
+  const interpolatedValue = interpolation1(getLView(), prefix, v0, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -122,7 +123,7 @@ export function ɵɵpropertyInterpolate2(
     propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolatedValue = interpolation2(getLView(), prefix, v0, i0, v1, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -166,7 +167,7 @@ export function ɵɵpropertyInterpolate3(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolatedValue = interpolation3(getLView(), prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -212,7 +213,7 @@ export function ɵɵpropertyInterpolate4(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolatedValue = interpolation4(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -260,7 +261,8 @@ export function ɵɵpropertyInterpolate5(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolatedValue =
+      interpolation5(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -312,7 +314,7 @@ export function ɵɵpropertyInterpolate6(
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+      interpolation6(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -365,8 +367,8 @@ export function ɵɵpropertyInterpolate7(
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue =
-      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+  const interpolatedValue = interpolation7(
+      getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -421,8 +423,8 @@ export function ɵɵpropertyInterpolate8(
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue =
-      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  const interpolatedValue = interpolation8(
+      getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
@@ -463,7 +465,7 @@ export function ɵɵpropertyInterpolateV(
     propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
 
-  const interpolatedValue = ɵɵinterpolationV(values);
+  const interpolatedValue = interpolationV(getLView(), values);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }

packages/core/src/render3/instructions/style_prop_interpolation.ts

@@ -5,12 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import {getLView} from '../state';
 import {NO_CHANGE} from '../tokens';
-import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+
+import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
 import {TsickleIssue1009} from './shared';
 import {ɵɵstyleProp} from './styling';
 
 
+
 /**
  *
  * Update an interpolated style property on an element with single bound value surrounded by text.
@@ -41,8 +44,7 @@ import {ɵɵstyleProp} from './styling';
 export function ɵɵstylePropInterpolate1(
     styleIndex: number, prefix: string, v0: any, suffix: string, valueSuffix?: string | null,
     forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
+  const interpolatedValue = interpolation1(getLView(), prefix, v0, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -81,8 +83,7 @@ export function ɵɵstylePropInterpolate1(
 export function ɵɵstylePropInterpolate2(
     styleIndex: number, prefix: string, v0: any, i0: string, v1: any, suffix: string,
     valueSuffix?: string | null, forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolatedValue = interpolation2(getLView(), prefix, v0, i0, v1, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -123,8 +124,7 @@ export function ɵɵstylePropInterpolate2(
 export function ɵɵstylePropInterpolate3(
     styleIndex: number, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     suffix: string, valueSuffix?: string | null, forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolatedValue = interpolation3(getLView(), prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -168,8 +168,7 @@ export function ɵɵstylePropInterpolate4(
     styleIndex: number, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     i2: string, v3: any, suffix: string, valueSuffix?: string | null,
     forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolatedValue = interpolation4(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -215,8 +214,8 @@ export function ɵɵstylePropInterpolate5(
     styleIndex: number, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     i2: string, v3: any, i3: string, v4: any, suffix: string, valueSuffix?: string | null,
     forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolatedValue =
+      interpolation5(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -264,9 +263,8 @@ export function ɵɵstylePropInterpolate6(
     styleIndex: number, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
     valueSuffix?: string | null, forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+      interpolation6(getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -317,9 +315,8 @@ export function ɵɵstylePropInterpolate7(
     styleIndex: number, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
     suffix: string, valueSuffix?: string | null, forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue =
-      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+  const interpolatedValue = interpolation7(
+      getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -373,9 +370,8 @@ export function ɵɵstylePropInterpolate8(
     i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string,
     v7: any, suffix: string, valueSuffix?: string | null,
     forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolatedValue =
-      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  const interpolatedValue = interpolation8(
+      getLView(), prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolatedValue as string, valueSuffix, forceOverride);
   }
@@ -416,8 +412,7 @@ export function ɵɵstylePropInterpolate8(
 export function ɵɵstylePropInterpolateV(
     styleIndex: number, values: any[], valueSuffix?: string | null,
     forceOverride?: boolean): TsickleIssue1009 {
-  // TODO(FW-1340): Refactor to remove the use of other instructions here.
-  const interpolated = ɵɵinterpolationV(values);
+  const interpolated = interpolationV(getLView(), values);
   if (interpolated !== NO_CHANGE) {
     ɵɵstyleProp(styleIndex, interpolated as string, valueSuffix, forceOverride);
   }

packages/core/src/render3/instructions/text_interpolation.ts

@@ -8,7 +8,7 @@
 import {getLView, getSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
 
-import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
 import {TsickleIssue1009, textBindingInternal} from './shared';
 
 
@@ -60,7 +60,7 @@ export function ɵɵtextInterpolate(v0: any): TsickleIssue1009 {
 export function ɵɵtextInterpolate1(prefix: string, v0: any, suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolation1(prefix, v0, suffix);
+  const interpolated = interpolation1(lView, prefix, v0, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -90,7 +90,7 @@ export function ɵɵtextInterpolate2(
     prefix: string, v0: any, i0: string, v1: any, suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolated = interpolation2(lView, prefix, v0, i0, v1, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -122,7 +122,7 @@ export function ɵɵtextInterpolate3(
     suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolated = interpolation3(lView, prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -154,7 +154,7 @@ export function ɵɵtextInterpolate4(
     suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolated = interpolation4(lView, prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -186,7 +186,7 @@ export function ɵɵtextInterpolate5(
     i3: string, v4: any, suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolated = interpolation5(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -220,7 +220,8 @@ export function ɵɵtextInterpolate6(
     i3: string, v4: any, i4: string, v5: any, suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+  const interpolated =
+      interpolation6(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -254,7 +255,7 @@ export function ɵɵtextInterpolate7(
   const index = getSelectedIndex();
   const lView = getLView();
   const interpolated =
-      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+      interpolation7(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -287,8 +288,8 @@ export function ɵɵtextInterpolate8(
     suffix: string): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated =
-      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  const interpolated = interpolation8(
+      lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }
@@ -322,7 +323,7 @@ export function ɵɵtextInterpolate8(
 export function ɵɵtextInterpolateV(values: any[]): TsickleIssue1009 {
   const index = getSelectedIndex();
   const lView = getLView();
-  const interpolated = ɵɵinterpolationV(values);
+  const interpolated = interpolationV(lView, values);
   if (interpolated !== NO_CHANGE) {
     textBindingInternal(lView, index, interpolated as string);
   }

packages/core/src/render3/jit/environment.ts

@@ -73,15 +73,6 @@ export const angularCoreEnv: {[name: string]: Function} =
        'ɵɵpureFunctionV': r3.ɵɵpureFunctionV,
        'ɵɵgetCurrentView': r3.ɵɵgetCurrentView,
        'ɵɵrestoreView': r3.ɵɵrestoreView,
-       'ɵɵinterpolation1': r3.ɵɵinterpolation1,
-       'ɵɵinterpolation2': r3.ɵɵinterpolation2,
-       'ɵɵinterpolation3': r3.ɵɵinterpolation3,
-       'ɵɵinterpolation4': r3.ɵɵinterpolation4,
-       'ɵɵinterpolation5': r3.ɵɵinterpolation5,
-       'ɵɵinterpolation6': r3.ɵɵinterpolation6,
-       'ɵɵinterpolation7': r3.ɵɵinterpolation7,
-       'ɵɵinterpolation8': r3.ɵɵinterpolation8,
-       'ɵɵinterpolationV': r3.ɵɵinterpolationV,
        'ɵɵlistener': r3.ɵɵlistener,
        'ɵɵload': r3.ɵɵload,
        'ɵɵprojection': r3.ɵɵprojection,

packages/core/test/bundling/todo/bundle.golden_symbols.json

@@ -675,10 +675,10 @@
     "name": "executeActionOnContainer"
   },
   {
-    "name": "executeActionOnElementOrContainer"
+    "name": "executeActionOnElementContainerOrIcuContainer"
   },
   {
-    "name": "executeActionOnElementContainerOrIcuContainer"
+    "name": "executeActionOnElementOrContainer"
   },
   {
     "name": "executeActionOnNode"
@@ -1118,6 +1118,9 @@
   {
     "name": "instantiateRootComponent"
   },
+  {
+    "name": "interpolation1"
+  },
   {
     "name": "invertObject"
   },
@@ -1619,9 +1622,6 @@
   {
     "name": "ɵɵinject"
   },
-  {
-    "name": "ɵɵinterpolation1"
-  },
   {
     "name": "ɵɵlistener"
   },

packages/core/test/render3/di_spec.ts

@@ -12,7 +12,7 @@ import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
 
 import {ɵɵdefineComponent} from '../../src/render3/definition';
 import {bloomAdd, bloomHasToken, bloomHashBitOrFactory as bloomHash, getOrCreateNodeInjectorForNode} from '../../src/render3/di';
-import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation2, ɵɵprojection, ɵɵprojectionDef, ɵɵreference, ɵɵselect, ɵɵtext, ɵɵtextBinding, ɵɵtextInterpolate2} from '../../src/render3/index';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵprojection, ɵɵprojectionDef, ɵɵreference, ɵɵselect, ɵɵtext, ɵɵtextBinding, ɵɵtextInterpolate2} from '../../src/render3/index';
 import {TNODE} from '../../src/render3/interfaces/injector';
 import {TNodeType} from '../../src/render3/interfaces/node';
 import {isProceduralRenderer} from '../../src/render3/interfaces/renderer';

packages/core/test/render3/pipe_spec.ts

@@ -9,7 +9,7 @@
 import {Directive as _Directive, Pipe as _Pipe, PipeTransform, WrappedValue, ɵɵdefinePipe} from '@angular/core';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
-import {ɵɵinterpolation1, ɵɵselect, ɵɵtext, ɵɵtextBinding, ɵɵtextInterpolate1} from '../../src/render3/instructions/all';
+import {ɵɵselect, ɵɵtext, ɵɵtextInterpolate1} from '../../src/render3/instructions/all';
 import {ɵɵpipe, ɵɵpipeBind1} from '../../src/render3/pipe';
 
 import {TemplateFixture} from './render_util';

tools/public_api_guard/core/core.d.ts

@@ -902,24 +902,6 @@ export interface ɵɵInjectorDef<T> {
     providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
 }
 
-export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
-
 export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
 
 export declare function ɵɵload<T>(index: number): T;