fix(compiler): remove container index from conditional instruction (#55190)

crisbeto · pkozlowski-opensource · commit 7d5bc1c62870 · 2024-04-16T10:23:30.000+02:00
Stops passing in the `containerIndex` argument to the `conditional` instruction since it isn't being used anymore. PR Close #55190
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/content_projection/ng_content_fallback.js b/packages/compiler-cli/test/compliance/test_cases/r3_compiler_compliance/components_and_directives/content_projection/ng_content_fallback.js
@@ -69,7 +69,7 @@ $r3$.ɵɵdefineComponent({
     }
     if (rf & 2) {
       $r3$.ɵɵadvance(5);
-      $r3$.ɵɵconditional(5, ctx.hasFooter ? 5 : -1);
+      $r3$.ɵɵconditional(ctx.hasFooter ? 5 : -1);
       $r3$.ɵɵadvance();
       $r3$.ɵɵproperty("ngIf", ctx.hasStructural);
     }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_if_else_if_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_if_else_if_template.js
@@ -33,6 +33,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ctx.value() === 1 ? 2 : ctx.otherValue() === 2 ? 3 : ctx.message ? 4 : 5);
+    $r3$.ɵɵconditional(ctx.value() === 1 ? 2 : ctx.otherValue() === 2 ? 3 : ctx.message ? 4 : 5);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_if_else_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_if_else_template.js
@@ -21,6 +21,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ctx.value() ? 2 : 3);
+    $r3$.ɵɵconditional(ctx.value() ? 2 : 3);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_if_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_if_template.js
@@ -15,6 +15,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ctx.value() ? 2 : -1);
+    $r3$.ɵɵconditional(ctx.value() ? 2 : -1);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_switch_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/basic_switch_template.js
@@ -34,6 +34,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : 5);
+    $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : 5);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_nested_alias_listeners_template.pipeline.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_nested_alias_listeners_template.pipeline.js
@@ -30,7 +30,7 @@ function MyApp_Conditional_0_Conditional_1_Conditional_1_Template(rf, ctx) {
 	  let $MyApp_Conditional_0_Conditional_1_contFlowTmp$;
 	  const $ctx_r2$ = $r3$.ɵɵnextContext(2);
 	  $r3$.ɵɵadvance();
-	  $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);
+	  $r3$.ɵɵconditional(($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);
 	}
   }
 
@@ -50,7 +50,7 @@ function MyApp_Conditional_0_Conditional_1_Conditional_1_Template(rf, ctx) {
 	  let $MyApp_Conditional_0_contFlowTmp$;
 	  const $ctx_r0$ = $r3$.ɵɵnextContext();
 	  $r3$.ɵɵadvance();
-	  $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);
+	  $r3$.ɵɵconditional(($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);
 	}
   }
   …
@@ -60,6 +60,6 @@ function MyApp_Conditional_0_Conditional_1_Conditional_1_Template(rf, ctx) {
 	}
 	if (rf & 2) {
 	  let $MyApp_contFlowTmp$;
-	  $r3$.ɵɵconditional(0, ($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);
+	  $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);
 	}
   }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_nested_alias_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_nested_alias_template.js
@@ -25,7 +25,7 @@ function MyApp_Conditional_0_Conditional_1_Template(rf, ctx) {
     …
     $r3$.ɵɵtextInterpolate3(" Inner: ", $ctx_r2$.value(), "/", $root_r1$, "/", ctx, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);
+    $r3$.ɵɵconditional(($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);
   }
 }
 
@@ -40,7 +40,7 @@ function MyApp_Conditional_0_Template(rf, ctx) {
     …
     $r3$.ɵɵtextInterpolate2(" Root: ", $ctx_r0$.value(), "/", ctx, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);
+    $r3$.ɵɵconditional(($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);
   }
 }
 …
@@ -50,6 +50,6 @@ function MyApp_Template(rf, ctx) {
   }
   if (rf & 2) {
     let $MyApp_contFlowTmp$;
-    $r3$.ɵɵconditional(0, ($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);
+    $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_with_alias_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_with_alias_template.js
@@ -20,6 +20,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.value()) ? 2 : -1, $MyApp_contFlowTmp$);
+    $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) ? 2 : -1, $MyApp_contFlowTmp$);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_with_pipe_template.pipeline.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/if_with_pipe_template.pipeline.js
@@ -30,6 +30,6 @@ function $MyApp_Conditional_3_Template$(rf, ctx) {
 	  $r3$.ɵɵadvance();
 	  $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
 	  $r3$.ɵɵadvance();
-	  $r3$.ɵɵconditional(2, $r3$.ɵɵpipeBind1(3, 2, ctx.val) === 1 ? 2 : $r3$.ɵɵpipeBind1(4, 4, ctx.val) === 2 ? 5 : 6);
+	  $r3$.ɵɵconditional($r3$.ɵɵpipeBind1(3, 2, ctx.val) === 1 ? 2 : $r3$.ɵɵpipeBind1(4, 4, ctx.val) === 2 ? 5 : 6);
 	}
   }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/nested_if_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/nested_if_template.js
@@ -40,7 +40,7 @@ function MyApp_Conditional_4_Template(rf, ctx) {
   }
   if (rf & 2) {
     const $ctx_r2$ = $r3$.ɵɵnextContext();
-    $r3$.ɵɵconditional(0, $ctx_r2$.innerVal === 0 ? 0 : $ctx_r2$.innerVal === 1 ? 1 : $ctx_r2$.innerVal === 2 ? 2 : 3);
+    $r3$.ɵɵconditional($ctx_r2$.innerVal === 0 ? 0 : $ctx_r2$.innerVal === 1 ? 1 : $ctx_r2$.innerVal === 2 ? 2 : 3);
   }
 }
 
@@ -61,6 +61,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ctx.val === 0 ? 2 : ctx.val === 1 ? 3 : ctx.val === 2 ? 4 : 5);
+    $r3$.ɵɵconditional(ctx.val === 0 ? 2 : ctx.val === 1 ? 3 : ctx.val === 2 ? 4 : 5);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/nested_switch_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/nested_switch_template.js
@@ -30,7 +30,7 @@ function MyApp_Case_3_Template(rf, ctx) {
     …
     const $ctx_r1$ = $r3$.ɵɵnextContext();
     …
-    $r3$.ɵɵconditional(0, ($MyApp_Case_3_contFlowTmp$ = $ctx_r1$.nestedValue()) === 0 ? 0 : $MyApp_Case_3_contFlowTmp$ === 1 ? 1 : $MyApp_Case_3_contFlowTmp$ === 2 ? 2 : -1);
+    $r3$.ɵɵconditional(($MyApp_Case_3_contFlowTmp$ = $ctx_r1$.nestedValue()) === 0 ? 0 : $MyApp_Case_3_contFlowTmp$ === 1 ? 1 : $MyApp_Case_3_contFlowTmp$ === 2 ? 2 : -1);
   }
 }
 
@@ -52,6 +52,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : -1);
+    $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : -1);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/switch_with_pipe_template.pipeline.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/switch_with_pipe_template.pipeline.js
@@ -14,6 +14,6 @@ function MyApp_Template(rf, ctx) {
 	  $r3$.ɵɵadvance();
 	  $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
 	  $r3$.ɵɵadvance();
-	  $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = $r3$.ɵɵpipeBind1(3, 2, ctx.value())) === $r3$.ɵɵpipeBind1(4, 4, 0) ? 2 : $MyApp_contFlowTmp$ === $r3$.ɵɵpipeBind1(5, 6, 1) ? 6 : 7);
+	  $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = $r3$.ɵɵpipeBind1(3, 2, ctx.value())) === $r3$.ɵɵpipeBind1(4, 4, 0) ? 2 : $MyApp_contFlowTmp$ === $r3$.ɵɵpipeBind1(5, 6, 1) ? 6 : 7);
 	}
   }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/switch_without_default_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_control_flow/switch_without_default_template.js
@@ -28,6 +28,6 @@ function MyApp_Template(rf, ctx) {
     $r3$.ɵɵadvance();
     $r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");
     $r3$.ɵɵadvance();
-    $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : -1);
+    $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : -1);
   }
 }
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/blocks/conditional_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/blocks/conditional_template.js
@@ -88,9 +88,9 @@ MyApp.ɵcmp = /*@__PURE__*/ $r3$.ɵɵdefineComponent({
     }
     if (rf & 2) {
       $r3$.ɵɵadvance(2);
-      $r3$.ɵɵconditional(2, ctx.count === 0 ? 2 : ctx.count === 1 ? 3 : 4);
+      $r3$.ɵɵconditional(ctx.count === 0 ? 2 : ctx.count === 1 ? 3 : 4);
       $r3$.ɵɵadvance(3);
-      $r3$.ɵɵconditional(5, ctx.count === 7 ? 5 : -1);
+      $r3$.ɵɵconditional(ctx.count === 7 ? 5 : -1);
     }
   },
   …
diff --git a/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/blocks/switch_template.js b/packages/compiler-cli/test/compliance/test_cases/r3_view_compiler_i18n/blocks/switch_template.js
@@ -77,7 +77,7 @@ MyApp.ɵcmp = /*@__PURE__*/ $r3$.ɵɵdefineComponent({
     if (rf & 2) {
       let $MyApp_contFlowTmp$;
       $r3$.ɵɵadvance(2);
-      $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.count) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : 4);
+      $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.count) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : 4);
     }
   },
   …
diff --git a/packages/compiler/src/template/pipeline/ir/src/ops/update.ts b/packages/compiler/src/template/pipeline/ir/src/ops/update.ts
@@ -598,11 +598,6 @@ export interface ConditionalOp extends Op<ConditionalOp>, DependsOnSlotContextOp
    */
   target: XrefId;
 
-  /**
-   * The slot of the target, to be populated during slot allocation.
-   */
-  targetSlot: SlotHandle;
-
   /**
    * The main test expression (for a switch), or `null` (for an if, which has no test
    * expression).
@@ -634,12 +629,11 @@ export interface ConditionalOp extends Op<ConditionalOp>, DependsOnSlotContextOp
  * Create a conditional op, which will display an embedded view according to a condtion.
  */
 export function createConditionalOp(
-    target: XrefId, targetSlot: SlotHandle, test: o.Expression|null,
-    conditions: Array<ConditionalCaseExpr>, sourceSpan: ParseSourceSpan): ConditionalOp {
+    target: XrefId, test: o.Expression|null, conditions: Array<ConditionalCaseExpr>,
+    sourceSpan: ParseSourceSpan): ConditionalOp {
   return {
     kind: OpKind.Conditional,
     target,
-    targetSlot,
     test,
     conditions,
     processed: null,
diff --git a/packages/compiler/src/template/pipeline/src/ingest.ts b/packages/compiler/src/template/pipeline/src/ingest.ts
@@ -355,7 +355,6 @@ function ingestBoundText(
  */
 function ingestIfBlock(unit: ViewCompilationUnit, ifBlock: t.IfBlock): void {
   let firstXref: ir.XrefId|null = null;
-  let firstSlotHandle: ir.SlotHandle|null = null;
   let conditions: Array<ir.ConditionalCaseExpr> = [];
   for (let i = 0; i < ifBlock.branches.length; i++) {
     const ifCase = ifBlock.branches[i];
@@ -381,7 +380,6 @@ function ingestIfBlock(unit: ViewCompilationUnit, ifBlock: t.IfBlock): void {
 
     if (firstXref === null) {
       firstXref = cView.xref;
-      firstSlotHandle = templateOp.handle;
     }
 
     const caseExpr = ifCase.expression ? convertAst(ifCase.expression, unit.job, null) : null;
@@ -390,9 +388,7 @@ function ingestIfBlock(unit: ViewCompilationUnit, ifBlock: t.IfBlock): void {
     conditions.push(conditionalCaseExpr);
     ingestNodes(cView, ifCase.children);
   }
-  const conditional =
-      ir.createConditionalOp(firstXref!, firstSlotHandle!, null, conditions, ifBlock.sourceSpan);
-  unit.update.push(conditional);
+  unit.update.push(ir.createConditionalOp(firstXref!, null, conditions, ifBlock.sourceSpan));
 }
 
 /**
@@ -405,7 +401,6 @@ function ingestSwitchBlock(unit: ViewCompilationUnit, switchBlock: t.SwitchBlock
   }
 
   let firstXref: ir.XrefId|null = null;
-  let firstSlotHandle: ir.SlotHandle|null = null;
   let conditions: Array<ir.ConditionalCaseExpr> = [];
   for (const switchCase of switchBlock.cases) {
     const cView = unit.job.allocateView(unit.xref);
@@ -424,7 +419,6 @@ function ingestSwitchBlock(unit: ViewCompilationUnit, switchBlock: t.SwitchBlock
     unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
-      firstSlotHandle = templateOp.handle;
     }
     const caseExpr = switchCase.expression ?
         convertAst(switchCase.expression, unit.job, switchBlock.startSourceSpan) :
@@ -434,10 +428,9 @@ function ingestSwitchBlock(unit: ViewCompilationUnit, switchBlock: t.SwitchBlock
     conditions.push(conditionalCaseExpr);
     ingestNodes(cView, switchCase.children);
   }
-  const conditional = ir.createConditionalOp(
-      firstXref!, firstSlotHandle!, convertAst(switchBlock.expression, unit.job, null), conditions,
-      switchBlock.sourceSpan);
-  unit.update.push(conditional);
+  unit.update.push(ir.createConditionalOp(
+      firstXref!, convertAst(switchBlock.expression, unit.job, null), conditions,
+      switchBlock.sourceSpan));
 }
 
 function ingestDeferView(
diff --git a/packages/compiler/src/template/pipeline/src/instruction.ts b/packages/compiler/src/template/pipeline/src/instruction.ts
@@ -544,9 +544,9 @@ function call<OpT extends ir.CreateOp|ir.UpdateOp>(
 }
 
 export function conditional(
-    slot: number, condition: o.Expression, contextValue: o.Expression|null,
+    condition: o.Expression, contextValue: o.Expression|null,
     sourceSpan: ParseSourceSpan|null): ir.UpdateOp {
-  const args = [o.literal(slot), condition];
+  const args = [condition];
   if (contextValue !== null) {
     args.push(contextValue);
   }
diff --git a/packages/compiler/src/template/pipeline/src/phases/reify.ts b/packages/compiler/src/template/pipeline/src/phases/reify.ts
@@ -416,11 +416,7 @@ function reifyUpdateOperations(_unit: CompilationUnit, ops: ir.OpList<ir.UpdateO
         if (op.processed === null) {
           throw new Error(`Conditional test was not set.`);
         }
-        if (op.targetSlot.slot === null) {
-          throw new Error(`Conditional slot was not set.`);
-        }
-        ir.OpList.replace(
-            op, ng.conditional(op.targetSlot.slot, op.processed, op.contextValue, op.sourceSpan));
+        ir.OpList.replace(op, ng.conditional(op.processed, op.contextValue, op.sourceSpan));
         break;
       case ir.OpKind.Repeater:
         ir.OpList.replace(op, ng.repeater(op.collection, op.sourceSpan));
diff --git a/packages/core/src/render3/instructions/control_flow.ts b/packages/core/src/render3/instructions/control_flow.ts
@@ -33,12 +33,12 @@ import {declareTemplate} from './template';
  * built-in "if" and "switch". On the high level this instruction is responsible for adding and
  * removing views selected by a conditional expression.
  *
- * @param matchingTemplateIndex index of a template TNode representing a conditional view to be
+ * @param matchingTemplateIndex Index of a template TNode representing a conditional view to be
  *     inserted; -1 represents a special case when there is no view to insert.
+ * @param contextValue Value that should be exposed as the context of the conditional.
  * @codeGenApi
  */
-export function ɵɵconditional<T>(containerIndex: number, matchingTemplateIndex: number, value?: T) {
-  // TODO: we could remove the containerIndex argument to this instruction now (!)
+export function ɵɵconditional<T>(matchingTemplateIndex: number, contextValue?: T) {
   performanceMarkFeature('NgControlFlow');
 
   const hostLView = getLView();
@@ -69,7 +69,7 @@ export function ɵɵconditional<T>(containerIndex: number, matchingTemplateIndex
         const dehydratedView =
             findMatchingDehydratedView(nextContainer, templateTNode.tView!.ssrId);
         const embeddedLView =
-            createAndRenderEmbeddedLView(hostLView, templateTNode, value, {dehydratedView});
+            createAndRenderEmbeddedLView(hostLView, templateTNode, contextValue, {dehydratedView});
 
         addLViewToLContainer(
             nextContainer, embeddedLView, viewInContainerIdx,
@@ -83,7 +83,7 @@ export function ɵɵconditional<T>(containerIndex: number, matchingTemplateIndex
     // changed - re-bind in context.
     const lView = getLViewFromLContainer<T|undefined>(prevContainer, viewInContainerIdx);
     if (lView !== undefined) {
-      lView[CONTEXT] = value;
+      lView[CONTEXT] = contextValue;
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ $r3$.ɵɵdefineComponent({`
`69`	`69`	`}`
`70`	`70`	`if (rf & 2) {`
`71`	`71`	`$r3$.ɵɵadvance(5);`
`72`		`- $r3$.ɵɵconditional(5, ctx.hasFooter ? 5 : -1);`
	`72`	`+ $r3$.ɵɵconditional(ctx.hasFooter ? 5 : -1);`
`73`	`73`	`$r3$.ɵɵadvance();`
`74`	`74`	`$r3$.ɵɵproperty("ngIf", ctx.hasStructural);`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ function MyApp_Template(rf, ctx) {`
`33`	`33`	`$r3$.ɵɵadvance();`
`34`	`34`	`$r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");`
`35`	`35`	`$r3$.ɵɵadvance();`
`36`		`- $r3$.ɵɵconditional(2, ctx.value() === 1 ? 2 : ctx.otherValue() === 2 ? 3 : ctx.message ? 4 : 5);`
	`36`	`+ $r3$.ɵɵconditional(ctx.value() === 1 ? 2 : ctx.otherValue() === 2 ? 3 : ctx.message ? 4 : 5);`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ function MyApp_Template(rf, ctx) {`
`21`	`21`	`$r3$.ɵɵadvance();`
`22`	`22`	`$r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");`
`23`	`23`	`$r3$.ɵɵadvance();`
`24`		`- $r3$.ɵɵconditional(2, ctx.value() ? 2 : 3);`
	`24`	`+ $r3$.ɵɵconditional(ctx.value() ? 2 : 3);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ function MyApp_Template(rf, ctx) {`
`15`	`15`	`$r3$.ɵɵadvance();`
`16`	`16`	`$r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");`
`17`	`17`	`$r3$.ɵɵadvance();`
`18`		`- $r3$.ɵɵconditional(2, ctx.value() ? 2 : -1);`
	`18`	`+ $r3$.ɵɵconditional(ctx.value() ? 2 : -1);`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ function MyApp_Template(rf, ctx) {`
`34`	`34`	`$r3$.ɵɵadvance();`
`35`	`35`	`$r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");`
`36`	`36`	`$r3$.ɵɵadvance();`
`37`		`- $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : 5);`
	`37`	`+ $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) === 0 ? 2 : $MyApp_contFlowTmp$ === 1 ? 3 : $MyApp_contFlowTmp$ === 2 ? 4 : 5);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function MyApp_Conditional_0_Conditional_1_Conditional_1_Template(rf, ctx) {`
`30`	`30`	`let $MyApp_Conditional_0_Conditional_1_contFlowTmp$;`
`31`	`31`	`const $ctx_r2$ = $r3$.ɵɵnextContext(2);`
`32`	`32`	`$r3$.ɵɵadvance();`
`33`		`- $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);`
	`33`	`+ $r3$.ɵɵconditional(($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`@@ -50,7 +50,7 @@ function MyApp_Conditional_0_Conditional_1_Conditional_1_Template(rf, ctx) {`
`50`	`50`	`let $MyApp_Conditional_0_contFlowTmp$;`
`51`	`51`	`const $ctx_r0$ = $r3$.ɵɵnextContext();`
`52`	`52`	`$r3$.ɵɵadvance();`
`53`		`- $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);`
	`53`	`+ $r3$.ɵɵconditional(($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`…`
`@@ -60,6 +60,6 @@ function MyApp_Conditional_0_Conditional_1_Conditional_1_Template(rf, ctx) {`
`60`	`60`	`}`
`61`	`61`	`if (rf & 2) {`
`62`	`62`	`let $MyApp_contFlowTmp$;`
`63`		`- $r3$.ɵɵconditional(0, ($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);`
	`63`	`+ $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function MyApp_Conditional_0_Conditional_1_Template(rf, ctx) {`
`25`	`25`	`…`
`26`	`26`	`$r3$.ɵɵtextInterpolate3(" Inner: ", $ctx_r2$.value(), "/", $root_r1$, "/", ctx, " ");`
`27`	`27`	`$r3$.ɵɵadvance();`
`28`		`- $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);`
	`28`	`+ $r3$.ɵɵconditional(($MyApp_Conditional_0_Conditional_1_contFlowTmp$ = $ctx_r2$.value()) ? 1 : -1, $MyApp_Conditional_0_Conditional_1_contFlowTmp$);`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -40,7 +40,7 @@ function MyApp_Conditional_0_Template(rf, ctx) {`
`40`	`40`	`…`
`41`	`41`	`$r3$.ɵɵtextInterpolate2(" Root: ", $ctx_r0$.value(), "/", ctx, " ");`
`42`	`42`	`$r3$.ɵɵadvance();`
`43`		`- $r3$.ɵɵconditional(1, ($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);`
	`43`	`+ $r3$.ɵɵconditional(($MyApp_Conditional_0_contFlowTmp$ = $ctx_r0$.value()) ? 1 : -1, $MyApp_Conditional_0_contFlowTmp$);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`…`
`@@ -50,6 +50,6 @@ function MyApp_Template(rf, ctx) {`
`50`	`50`	`}`
`51`	`51`	`if (rf & 2) {`
`52`	`52`	`let $MyApp_contFlowTmp$;`
`53`		`- $r3$.ɵɵconditional(0, ($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);`
	`53`	`+ $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) ? 0 : -1, $MyApp_contFlowTmp$);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ function MyApp_Template(rf, ctx) {`
`20`	`20`	`$r3$.ɵɵadvance();`
`21`	`21`	`$r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");`
`22`	`22`	`$r3$.ɵɵadvance();`
`23`		`- $r3$.ɵɵconditional(2, ($MyApp_contFlowTmp$ = ctx.value()) ? 2 : -1, $MyApp_contFlowTmp$);`
	`23`	`+ $r3$.ɵɵconditional(($MyApp_contFlowTmp$ = ctx.value()) ? 2 : -1, $MyApp_contFlowTmp$);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ function $MyApp_Conditional_3_Template$(rf, ctx) {`
`30`	`30`	`$r3$.ɵɵadvance();`
`31`	`31`	`$r3$.ɵɵtextInterpolate1(" ", ctx.message, " ");`
`32`	`32`	`$r3$.ɵɵadvance();`
`33`		`- $r3$.ɵɵconditional(2, $r3$.ɵɵpipeBind1(3, 2, ctx.val) === 1 ? 2 : $r3$.ɵɵpipeBind1(4, 4, ctx.val) === 2 ? 5 : 6);`
	`33`	`+ $r3$.ɵɵconditional($r3$.ɵɵpipeBind1(3, 2, ctx.val) === 1 ? 2 : $r3$.ɵɵpipeBind1(4, 4, ctx.val) === 2 ? 5 : 6);`
`34`	`34`	`}`
`35`	`35`	`}`