{"files":[{"path":"compiler\/forget\/src\/HIR\/PrintHIR.ts","status":"M"},{"path":"compiler\/forget\/src\/SSA\/LeaveSSA.ts","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/infer-phi-primitive.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/primitive-alias-mutate.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-separate-scopes.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-leave-case.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-phi.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-reassignment.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-shadowing.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md","status":"M"}],"commit":{"shortRevision":"e7f4eae619","authorEmail":"poteto@users.noreply.github.com","revision":"e7f4eae619cd38c829c62f5a6f869b50f7789c70","authoredAt":"2023-02-08T10:26:31-05:00","subject":"Reset canonicalId mutable range if not mutated after creation","authorName":"Lauren Tan"},"parents":["6f661f3b799bc4aea96be2d6a9808801a11327b3"],"body":"","patch":"diff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex 32d4a3ead4..a8137ba25a 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -114,7 +114,7 @@ export function printInstruction(instr: ReactiveInstruction): string {\n function printPhi(phi: Phi): string {\n const items = [];\n items.push(printIdentifier(phi.id));\n- \/\/ items.push(printMutableRange(phi.id));\n+ items.push(printMutableRange(phi.id));\n items.push(printType(phi.type));\n items.push(\": phi(\");\n const phis = [];\ndiff --git a\/compiler\/forget\/src\/SSA\/LeaveSSA.ts b\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\nindex 14afaf59cd..532d84e8d9 100644\n--- a\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\n+++ b\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\n@@ -174,15 +174,8 @@ export function leaveSSA(fn: HIRFunction) {\n }\n \n \/\/ all versions of the variable need to be remapped to the canonical id\n- \/\/ also extend the mutable range of the canonical id based on the min\/max\n- \/\/ of the ranges of its operands\n- let start = canonicalId.mutableRange.start as number;\n- let end = canonicalId.mutableRange.end as number;\n for (const [, operand] of phi.operands) {\n- start = Math.min(start, operand.mutableRange.start);\n- end = Math.max(end, operand.mutableRange.end);\n reassignments.set(operand, canonicalId);\n-\n if (operand.mutableRange.start < terminal.id) {\n invariant(\n initOperand === null,\n@@ -191,8 +184,6 @@ export function leaveSSA(fn: HIRFunction) {\n initOperand = operand;\n }\n }\n- canonicalId.mutableRange.start = makeInstructionId(start);\n- canonicalId.mutableRange.end = makeInstructionId(end);\n \n \/\/ If there are no instructions in the block then there's just a terminal\n \/\/ node, which has no mutation, so that should be false.\n@@ -203,6 +194,14 @@ export function leaveSSA(fn: HIRFunction) {\n phi.id.mutableRange.end >\n (phiBlock.instructions.at(0)?.id ?? phiBlock.terminal.id);\n \n+ \/\/ If a phi is never mutated after creation, reset its mutable range to be itself\n+ if (!isPhiMutatedAfterCreation) {\n+ canonicalId.mutableRange.start = phiBlock.terminal.id;\n+ canonicalId.mutableRange.end = makeInstructionId(\n+ phiBlock.terminal.id + 1\n+ );\n+ }\n+\n \/\/ If this phi id is the canonical id we need to generate a let binding for it\n \/\/ (otherwise, it means this phi merges into some other phi which already generated\n \/\/ a binding\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md\nindex 3e20cfff28..5c66dadd3e 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md\n@@ -29,29 +29,19 @@ function Component(props) {\n const $ = React.unstable_useMemoCache();\n const cond = props.cond;\n const x = props.x;\n- const c_0 = $[0] !== cond;\n- const c_1 = $[1] !== x;\n- let a;\n- if (c_0 || c_1) {\n- a = undefined;\n- if (cond) {\n- const a$0 = x;\n- a = a$0;\n+ let a = undefined;\n+ if (cond) {\n+ const a$0 = x;\n+ a = a$0;\n+ } else {\n+ let a$1;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ a$1 = [];\n+ $[0] = a$1;\n } else {\n- let a$1;\n- if ($[3] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- a$1 = [];\n- $[3] = a$1;\n- } else {\n- a$1 = $[3];\n- }\n- a = a$1;\n+ a$1 = $[0];\n }\n- $[0] = cond;\n- $[1] = x;\n- $[2] = a;\n- } else {\n- a = $[2];\n+ a = a$1;\n }\n \n useFreeze(a);\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/infer-phi-primitive.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/infer-phi-primitive.expect.md\nindex 8089a133a3..5c2a1044ae 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/infer-phi-primitive.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/infer-phi-primitive.expect.md\n@@ -20,22 +20,13 @@ function foo(a, b) {\n \n ```javascript\n function foo(a, b) {\n- const $ = React.unstable_useMemoCache();\n- const c_0 = $[0] !== a;\n- let x;\n- if (c_0) {\n- x = undefined;\n- if (a) {\n- const x$0 = 1;\n- x = x$0;\n- } else {\n- const x$1 = 2;\n- x = x$1;\n- }\n- $[0] = a;\n- $[1] = x;\n+ let x = undefined;\n+ if (a) {\n+ const x$0 = 1;\n+ x = x$0;\n } else {\n- x = $[1];\n+ const x$1 = 2;\n+ x = x$1;\n }\n \n const y = x;\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md\nindex e3f4ed85c8..02a22b8c47 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md\n@@ -20,39 +20,29 @@ function foo(a, b, c, d) {\n ```javascript\n function foo(a, b, c, d) {\n const $ = React.unstable_useMemoCache();\n- const c_0 = $[0] !== b;\n- const c_1 = $[1] !== c;\n- let x;\n- if (c_0 || c_1) {\n- x = undefined;\n- if (someVal) {\n- const c_3 = $[3] !== b;\n- let x$0;\n- if (c_3) {\n- x$0 = { b: b };\n- $[3] = b;\n- $[4] = x$0;\n- } else {\n- x$0 = $[4];\n- }\n- x = x$0;\n+ let x = undefined;\n+ if (someVal) {\n+ const c_0 = $[0] !== b;\n+ let x$0;\n+ if (c_0) {\n+ x$0 = { b: b };\n+ $[0] = b;\n+ $[1] = x$0;\n } else {\n- const c_5 = $[5] !== c;\n- let x$1;\n- if (c_5) {\n- x$1 = { c: c };\n- $[5] = c;\n- $[6] = x$1;\n- } else {\n- x$1 = $[6];\n- }\n- x = x$1;\n+ x$0 = $[1];\n }\n- $[0] = b;\n- $[1] = c;\n- $[2] = x;\n+ x = x$0;\n } else {\n- x = $[2];\n+ const c_2 = $[2] !== c;\n+ let x$1;\n+ if (c_2) {\n+ x$1 = { c: c };\n+ $[2] = c;\n+ $[3] = x$1;\n+ } else {\n+ x$1 = $[3];\n+ }\n+ x = x$1;\n }\n return x;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/primitive-alias-mutate.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/primitive-alias-mutate.expect.md\nindex 448ab5ba68..0014449a79 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/primitive-alias-mutate.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/primitive-alias-mutate.expect.md\n@@ -20,22 +20,13 @@ function component(a) {\n \n ```javascript\n function component(a) {\n- const $ = React.unstable_useMemoCache();\n- const c_0 = $[0] !== a;\n- let x;\n- if (c_0) {\n- x = undefined;\n- if (a) {\n- const x$0 = \"bar\";\n- x = x$0;\n- } else {\n- const x$1 = \"baz\";\n- x = x$1;\n- }\n- $[0] = a;\n- $[1] = x;\n+ let x = undefined;\n+ if (a) {\n+ const x$0 = \"bar\";\n+ x = x$0;\n } else {\n- x = $[1];\n+ const x$1 = \"baz\";\n+ x = x$1;\n }\n \n const y = x;\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md\nindex 5925eeeeca..eb87414d0c 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md\n@@ -35,37 +35,27 @@ function Component(props) {\n x = $[1];\n }\n const y = x;\n- const c_2 = $[2] !== props.p1;\n- let x$0;\n- if (c_2) {\n- x$0 = x;\n- if (props.p1) {\n- let x$1;\n- if ($[4] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- x$1 = [];\n- $[4] = x$1;\n- } else {\n- x$1 = $[4];\n- }\n- x$0 = x$1;\n+ let x$0 = x;\n+ if (props.p1) {\n+ let x$1;\n+ if ($[2] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ x$1 = [];\n+ $[2] = x$1;\n+ } else {\n+ x$1 = $[2];\n }\n- $[2] = props.p1;\n- $[3] = x$0;\n- } else {\n- x$0 = $[3];\n+ x$0 = x$1;\n }\n \n y.push(props.p2);\n- const c_5 = $[5] !== x$0;\n- const c_6 = $[6] !== y;\n+ const c_3 = $[3] !== y;\n let t0;\n- if (c_5 || c_6) {\n+ if (c_3) {\n t0 = <\/Component>;\n- $[5] = x$0;\n- $[6] = y;\n- $[7] = t0;\n+ $[3] = y;\n+ $[4] = t0;\n } else {\n- t0 = $[7];\n+ t0 = $[4];\n }\n return t0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-separate-scopes.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-separate-scopes.expect.md\nindex 3fadaf0fcb..f65319c67a 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-separate-scopes.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-separate-scopes.expect.md\n@@ -56,61 +56,49 @@ function foo(a, b, c) {\n } else {\n y = $[3];\n }\n- const c_4 = $[4] !== b;\n- const c_5 = $[5] !== c;\n- let x$0;\n- if (c_4 || c_5) {\n- x$0 = undefined;\n- bb3: switch (b) {\n- case 0: {\n- const c_7 = $[7] !== b;\n- let x$1;\n- if (c_7) {\n- x$1 = [];\n- x$1.push(b);\n- $[7] = b;\n- $[8] = x$1;\n- } else {\n- x$1 = $[8];\n- }\n- x$0 = x$1;\n- break bb3;\n+ let x$0 = undefined;\n+ bb3: switch (b) {\n+ case 0: {\n+ const c_4 = $[4] !== b;\n+ let x$1;\n+ if (c_4) {\n+ x$1 = [];\n+ x$1.push(b);\n+ $[4] = b;\n+ $[5] = x$1;\n+ } else {\n+ x$1 = $[5];\n }\n- default: {\n- const c_9 = $[9] !== c;\n- let x$2;\n- if (c_9) {\n- x$2 = [];\n- x$2.push(c);\n- $[9] = c;\n- $[10] = x$2;\n- } else {\n- x$2 = $[10];\n- }\n- x$0 = x$2;\n+ x$0 = x$1;\n+ break bb3;\n+ }\n+ default: {\n+ const c_6 = $[6] !== c;\n+ let x$2;\n+ if (c_6) {\n+ x$2 = [];\n+ x$2.push(c);\n+ $[6] = c;\n+ $[7] = x$2;\n+ } else {\n+ x$2 = $[7];\n }\n+ x$0 = x$2;\n }\n- $[4] = b;\n- $[5] = c;\n- $[6] = x$0;\n- } else {\n- x$0 = $[6];\n }\n- const c_11 = $[11] !== y;\n- const c_12 = $[12] !== x$0;\n+ const c_8 = $[8] !== y;\n let t0;\n- if (c_11 || c_12) {\n+ if (c_8) {\n t0 = (\n

\n {y}\n {x$0}\n <\/div>\n );\n- $[11] = y;\n- $[12] = x$0;\n- $[13] = t0;\n+ $[8] = y;\n+ $[9] = t0;\n } else {\n- t0 = $[13];\n+ t0 = $[9];\n }\n return t0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-leave-case.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-leave-case.expect.md\nindex 4c7225c6d8..ba26e228b8 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-leave-case.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-leave-case.expect.md\n@@ -27,11 +27,10 @@ function Component(props) {\n const c_0 = $[0] !== props.p0;\n const c_1 = $[1] !== props.p1;\n let x;\n- let y$0;\n if (c_0 || c_1) {\n x = [];\n const y = undefined;\n- y$0 = y;\n+ let y$0 = y;\n if (props.p0) {\n x.push(props.p1);\n const y$1 = x;\n@@ -40,26 +39,22 @@ function Component(props) {\n $[0] = props.p0;\n $[1] = props.p1;\n $[2] = x;\n- $[3] = y$0;\n } else {\n x = $[2];\n- y$0 = $[3];\n }\n- const c_4 = $[4] !== x;\n- const c_5 = $[5] !== y$0;\n+ const c_3 = $[3] !== x;\n let t0;\n- if (c_4 || c_5) {\n+ if (c_3) {\n t0 = (\n \n {x}\n {y$0}\n <\/Component>\n );\n- $[4] = x;\n- $[5] = y$0;\n- $[6] = t0;\n+ $[3] = x;\n+ $[4] = t0;\n } else {\n- t0 = $[6];\n+ t0 = $[4];\n }\n return t0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-phi.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-phi.expect.md\nindex 37ffd23bc5..f6c4b97fb7 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-phi.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-phi.expect.md\n@@ -19,21 +19,12 @@ function foo(a, b, c) {\n \n ```javascript\n function foo(a, b, c) {\n- const $ = React.unstable_useMemoCache();\n const x = a;\n if (b) {\n- const c_0 = $[0] !== c;\n- let x$0;\n- if (c_0) {\n- x$0 = x;\n- if (c) {\n- const x$1 = c;\n- x$0 = x$1;\n- }\n- $[0] = c;\n- $[1] = x$0;\n- } else {\n- x$0 = $[1];\n+ let x$0 = x;\n+ if (c) {\n+ const x$1 = c;\n+ x$0 = x$1;\n }\n return x$0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-reassignment.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-reassignment.expect.md\nindex bb07e3f0b2..735903f228 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-reassignment.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-nested-partial-reassignment.expect.md\n@@ -20,31 +20,16 @@ function foo(a, b, c, d, e) {\n \n ```javascript\n function foo(a, b, c, d, e) {\n- const $ = React.unstable_useMemoCache();\n const x = null;\n- const c_0 = $[0] !== a;\n- const c_1 = $[1] !== b;\n- const c_2 = $[2] !== c;\n- const c_3 = $[3] !== d;\n- let x$0;\n- if (c_0 || c_1 || c_2 || c_3) {\n- x$0 = x;\n- if (a) {\n- const x$1 = b;\n- x$0 = x$1;\n- } else {\n- if (c) {\n- const x$2 = d;\n- x$0 = x$2;\n- }\n- }\n- $[0] = a;\n- $[1] = b;\n- $[2] = c;\n- $[3] = d;\n- $[4] = x$0;\n+ let x$0 = x;\n+ if (a) {\n+ const x$1 = b;\n+ x$0 = x$1;\n } else {\n- x$0 = $[4];\n+ if (c) {\n+ const x$2 = d;\n+ x$0 = x$2;\n+ }\n }\n return x$0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming.expect.md\nindex 01f3e8648a..8e9ec02af8 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming.expect.md\n@@ -30,29 +30,19 @@ function foo(props) {\n } else {\n x = $[1];\n }\n- const c_2 = $[2] !== props.cond;\n- const c_3 = $[3] !== props.foo;\n- let x$0;\n- if (c_2 || c_3) {\n- x$0 = x;\n- if (props.cond) {\n- const c_5 = $[5] !== props.foo;\n- let x$1;\n- if (c_5) {\n- x$1 = [];\n- x$1.push(props.foo);\n- $[5] = props.foo;\n- $[6] = x$1;\n- } else {\n- x$1 = $[6];\n- }\n- x$0 = x$1;\n+ let x$0 = x;\n+ if (props.cond) {\n+ const c_2 = $[2] !== props.foo;\n+ let x$1;\n+ if (c_2) {\n+ x$1 = [];\n+ x$1.push(props.foo);\n+ $[2] = props.foo;\n+ $[3] = x$1;\n+ } else {\n+ x$1 = $[3];\n }\n- $[2] = props.cond;\n- $[3] = props.foo;\n- $[4] = x$0;\n- } else {\n- x$0 = $[4];\n+ x$0 = x$1;\n }\n return x$0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-shadowing.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-shadowing.expect.md\nindex dc47c50bef..6e0b1b7f56 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-shadowing.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-shadowing.expect.md\n@@ -23,23 +23,14 @@ function Foo(cond) {\n function log() {}\n \n function Foo(cond) {\n- const $ = React.unstable_useMemoCache();\n const str = \"\";\n- const c_0 = $[0] !== cond;\n- let str$0;\n- if (c_0) {\n- str$0 = str;\n- if (cond) {\n- const str_0 = \"other test\";\n- log(str_0);\n- } else {\n- const str$1 = \"fallthrough test\";\n- str$0 = str$1;\n- }\n- $[0] = cond;\n- $[1] = str$0;\n+ let str$0 = str;\n+ if (cond) {\n+ const str_0 = \"other test\";\n+ log(str_0);\n } else {\n- str$0 = $[1];\n+ const str$1 = \"fallthrough test\";\n+ str$0 = str$1;\n }\n \n log(str$0);\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md\nindex 9ddb49f74d..9fe7363ddb 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md\n@@ -36,11 +36,10 @@ function Component(props) {\n const c_0 = $[0] !== props.p0;\n const c_1 = $[1] !== props.p2;\n let x;\n- let y$0;\n if (c_0 || c_1) {\n x = [];\n const y = undefined;\n- y$0 = y;\n+ let y$0 = y;\n bb1: switch (props.p0) {\n case 1: {\n break bb1;\n@@ -48,11 +47,11 @@ function Component(props) {\n case true: {\n x.push(props.p2);\n let y$1;\n- if ($[4] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ if ($[3] === Symbol.for(\"react.memo_cache_sentinel\")) {\n y$1 = [];\n- $[4] = y$1;\n+ $[3] = y$1;\n } else {\n- y$1 = $[4];\n+ y$1 = $[3];\n }\n y$0 = y$1;\n break bb1;\n@@ -68,31 +67,27 @@ function Component(props) {\n $[0] = props.p0;\n $[1] = props.p2;\n $[2] = x;\n- $[3] = y$0;\n } else {\n x = $[2];\n- y$0 = $[3];\n }\n- const c_5 = $[5] !== x;\n+ const c_4 = $[4] !== x;\n let child;\n- if (c_5) {\n+ if (c_4) {\n child = <\/Component>;\n- $[5] = x;\n- $[6] = child;\n+ $[4] = x;\n+ $[5] = child;\n } else {\n- child = $[6];\n+ child = $[5];\n }\n y$0.push(props.p4);\n- const c_7 = $[7] !== y$0;\n- const c_8 = $[8] !== child;\n+ const c_6 = $[6] !== child;\n let t0;\n- if (c_7 || c_8) {\n+ if (c_6) {\n t0 = {child}<\/Component>;\n- $[7] = y$0;\n- $[8] = child;\n- $[9] = t0;\n+ $[6] = child;\n+ $[7] = t0;\n } else {\n- t0 = $[9];\n+ t0 = $[7];\n }\n return t0;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md\nindex fa5f40ea80..52cac52421 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md\n@@ -32,11 +32,10 @@ function Component(props) {\n const c_1 = $[1] !== props.p2;\n const c_2 = $[2] !== props.p3;\n let x;\n- let y$0;\n if (c_0 || c_1 || c_2) {\n x = [];\n const y = undefined;\n- y$0 = y;\n+ let y$0 = y;\n switch (props.p0) {\n case true: {\n x.push(props.p2);\n@@ -51,31 +50,27 @@ function Component(props) {\n $[1] = props.p2;\n $[2] = props.p3;\n $[3] = x;\n- $[4] = y$0;\n } else {\n x = $[3];\n- y$0 = $[4];\n }\n- const c_5 = $[5] !== x;\n+ const c_4 = $[4] !== x;\n let child;\n- if (c_5) {\n+ if (c_4) {\n child = <\/Component>;\n- $[5] = x;\n- $[6] = child;\n+ $[4] = x;\n+ $[5] = child;\n } else {\n- child = $[6];\n+ child = $[5];\n }\n y$0.push(props.p4);\n- const c_7 = $[7] !== y$0;\n- const c_8 = $[8] !== child;\n+ const c_6 = $[6] !== child;\n let t0;\n- if (c_7 || c_8) {\n+ if (c_6) {\n t0 = {child}<\/Component>;\n- $[7] = y$0;\n- $[8] = child;\n- $[9] = t0;\n+ $[6] = child;\n+ $[7] = t0;\n } else {\n- t0 = $[9];\n+ t0 = $[7];\n }\n return t0;\n }\n"}

dillon1000/react

Files changed