{"parents":["fdbfac8f8216839520d093513908918de591468f"],"files":[{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts"},{"status":"A","path":"compiler\/forget\/src\/Utils\/Stack.ts"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/dependencies.expect.md"},{"status":"R057","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md","previousPath":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md"},{"status":"R100","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.js","previousPath":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.js"},{"status":"R073","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md","previousPath":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.expect.md"},{"status":"R100","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.js","previousPath":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.js"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md"}],"body":"Fix for bug demonstrated in #1506. When we add variables as output of their \ndefining scope, we need to propagate this information upwards to all parent \nscopes which are not current active.","patch":"diff --git a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\nindex 1ded68ab50..eb135753ba 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n@@ -23,6 +23,7 @@ import {\n eachInstructionValueOperand,\n eachPatternOperand,\n } from \"..\/HIR\/visitors\";\n+import { empty, Stack } from \"..\/Utils\/Stack\";\n import { assertExhaustive } from \"..\/Utils\/utils\";\n import {\n ReactiveScopeDependencyTree,\n@@ -40,13 +41,13 @@ export function propagateScopeDependencies(fn: ReactiveFunction): void {\n if (fn.id !== null) {\n context.declare(fn.id, {\n id: makeInstructionId(0),\n- scope: null,\n+ scope: empty(),\n });\n }\n for (const param of fn.params) {\n context.declare(param.identifier, {\n id: makeInstructionId(0),\n- scope: null,\n+ scope: empty(),\n });\n }\n visit(context, fn.body);\n@@ -55,11 +56,9 @@ export function propagateScopeDependencies(fn: ReactiveFunction): void {\n type DeclMap = Map;\n type Decl = {\n id: InstructionId;\n- scope: ReactiveScope | null;\n+ scope: Stack;\n };\n \n-type Scopes = Array;\n-\n class Context {\n #declarations: DeclMap = new Map();\n #reassignments: Map = new Map();\n@@ -80,7 +79,7 @@ class Context {\n \/\/ - accessed by all cfg branches (added through promoteDeps)\n #depsInCurrentConditional: ReactiveScopeDependencyTree =\n new ReactiveScopeDependencyTree();\n- #scopes: Scopes = [];\n+ #scopes: Stack = empty();\n \n enter(scope: ReactiveScope, fn: () => void): Set {\n \/\/ Save context of previous scope\n@@ -94,12 +93,12 @@ class Context {\n const scopedDependencies = new ReactiveScopeDependencyTree();\n this.#inConditionalWithinScope = false;\n this.#dependencies = scopedDependencies;\n- this.#scopes.push(scope);\n+ this.#scopes = this.#scopes.push(scope);\n \n fn();\n \n \/\/ Restore context of previous scope\n- this.#scopes.pop();\n+ this.#scopes = this.#scopes.pop();\n this.#dependencies = previousDependencies;\n this.#inConditionalWithinScope = prevInConditional;\n \n@@ -246,22 +245,25 @@ class Context {\n const currentDeclaration =\n this.#reassignments.get(identifier) ??\n this.#declarations.get(identifier.id);\n- const currentScope = this.currentScope;\n+ const currentScope = this.#scopes !== null ? this.#scopes.value : null;\n return (\n currentScope != null &&\n currentDeclaration !== undefined &&\n currentDeclaration.id < currentScope.range.start &&\n (currentDeclaration.scope == null ||\n- currentDeclaration.scope !== currentScope)\n+ currentDeclaration.scope.value !== currentScope)\n );\n }\n \n #isScopeActive(scope: ReactiveScope): boolean {\n- return this.#scopes.indexOf(scope) !== -1;\n+ if (this.#scopes === null) {\n+ return false;\n+ }\n+ return this.#scopes.contains(scope);\n }\n \n- get currentScope(): ReactiveScope | null {\n- return this.#scopes.at(-1) ?? null;\n+ get currentScope(): Stack {\n+ return this.#scopes;\n }\n \n visitOperand(place: Place): void {\n@@ -300,15 +302,15 @@ class Context {\n const originalDeclaration = this.#declarations.get(\n maybeDependency.identifier.id\n );\n- if (\n- originalDeclaration !== undefined &&\n- originalDeclaration.scope !== null &&\n- !this.#isScopeActive(originalDeclaration.scope)\n- ) {\n- originalDeclaration.scope.declarations.set(\n- maybeDependency.identifier.id,\n- maybeDependency.identifier\n- );\n+ if (originalDeclaration !== undefined) {\n+ originalDeclaration.scope.each((scope) => {\n+ if (!this.#isScopeActive(scope)) {\n+ scope.declarations.set(\n+ maybeDependency.identifier.id,\n+ maybeDependency.identifier\n+ );\n+ }\n+ });\n }\n \n if (this.#checkValidDependencyId(maybeDependency.identifier)) {\n@@ -326,15 +328,15 @@ class Context {\n visitReassignment(place: Place): void {\n const declaration = this.#declarations.get(place.identifier.id);\n if (\n- this.currentScope != null &&\n+ this.currentScope.value != null &&\n place.identifier.scope != null &&\n declaration !== undefined &&\n- declaration.scope !== place.identifier.scope &&\n- !Array.from(this.currentScope.reassignments).some(\n+ declaration.scope.value !== place.identifier.scope &&\n+ !Array.from(this.currentScope.value.reassignments).some(\n (ident) => ident.id === place.identifier.id\n )\n ) {\n- this.currentScope.reassignments.add(place.identifier);\n+ this.currentScope.value.reassignments.add(place.identifier);\n }\n }\n }\ndiff --git a\/compiler\/forget\/src\/Utils\/Stack.ts b\/compiler\/forget\/src\/Utils\/Stack.ts\nnew file mode 100644\nindex 0000000000..68b2df059d\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/Utils\/Stack.ts\n@@ -0,0 +1,79 @@\n+\/**\n+ * Copyright (c) Meta Platforms, Inc. and affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\/\n+\n+export interface Stack {\n+ push(value: T): Stack;\n+\n+ pop(): Stack;\n+\n+ contains(value: T): boolean;\n+\n+ each(fn: (value: T) => void): void;\n+\n+ get value(): T | null;\n+}\n+\n+export function create(value: T): Stack {\n+ return new Node(value);\n+}\n+\n+export function empty(): Stack {\n+ return EMPTY as any;\n+}\n+\n+class Node implements Stack {\n+ #value: T;\n+ #next: Stack;\n+\n+ constructor(value: T, next: Stack = EMPTY as any) {\n+ this.#value = value;\n+ this.#next = next;\n+ }\n+\n+ push(value: T): Node {\n+ return new Node(value, this);\n+ }\n+\n+ pop(): Stack {\n+ return this.#next;\n+ }\n+\n+ contains(value: T): boolean {\n+ return (\n+ value === this.#value ||\n+ (this.#next !== null && this.#next.contains(value))\n+ );\n+ }\n+ each(fn: (value: T) => void): void {\n+ fn(this.#value);\n+ this.#next.each(fn);\n+ }\n+\n+ get value(): T {\n+ return this.#value;\n+ }\n+}\n+\n+class Empty implements Stack {\n+ push(value: T): Stack {\n+ return new Node(value, this);\n+ }\n+ pop(): Stack {\n+ return this;\n+ }\n+ contains(_value: T): boolean {\n+ return false;\n+ }\n+ each(_fn: (value: T) => void): void {\n+ return;\n+ }\n+ get value(): T | null {\n+ return null;\n+ }\n+}\n+\n+const EMPTY: Stack = new Empty();\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/dependencies.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/dependencies.expect.md\nindex 6ad952df97..f9e0a011c2 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/dependencies.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/dependencies.expect.md\n@@ -25,25 +25,36 @@ function foo(x, y, z) {\n ```javascript\n import * as React from \"react\";\n function foo(x, y, z) {\n- const $ = React.unstable_useMemoCache(3);\n- const items = [z];\n- items.push(x);\n- const c_0 = $[0] !== x;\n- const c_1 = $[1] !== y;\n+ const $ = React.unstable_useMemoCache(7);\n+ const c_0 = $[0] !== z;\n+ const c_1 = $[1] !== x;\n+ const c_2 = $[2] !== y;\n let items2;\n- if (c_0 || c_1) {\n- items2 = [];\n- if (x) {\n- items2.push(y);\n+ if (c_0 || c_1 || c_2) {\n+ const items = [z];\n+ items.push(x);\n+ const c_4 = $[4] !== x;\n+ const c_5 = $[5] !== y;\n+ if (c_4 || c_5) {\n+ items2 = [];\n+ if (x) {\n+ items2.push(y);\n+ }\n+ $[4] = x;\n+ $[5] = y;\n+ $[6] = items2;\n+ } else {\n+ items2 = $[6];\n+ }\n+ if (y) {\n+ items.push(x);\n }\n- $[0] = x;\n- $[1] = y;\n- $[2] = items2;\n+ $[0] = z;\n+ $[1] = x;\n+ $[2] = y;\n+ $[3] = items2;\n } else {\n- items2 = $[2];\n- }\n- if (y) {\n- items.push(x);\n+ items2 = $[3];\n }\n return items2;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\nsimilarity index 57%\nrename from compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\nrename to compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\nindex 03af913e61..5449ffe010 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\n@@ -24,7 +24,7 @@ function Component(props) {\n ```javascript\n import * as React from \"react\";\n function Component(props) {\n- const $ = React.unstable_useMemoCache(21);\n+ const $ = React.unstable_useMemoCache(23);\n const item = useFragment(FRAGMENT, props.item);\n useFreeze(item);\n const c_0 = $[0] !== item;\n@@ -32,6 +32,7 @@ function Component(props) {\n let t2;\n let t3;\n let t4;\n+ let t0;\n let t5;\n let t6;\n let t7;\n@@ -42,12 +43,11 @@ function Component(props) {\n t7 = \"\\n \";\n t3 = View;\n t4 = \"\\n \";\n- let t0;\n- if ($[8] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ if ($[9] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t0 = Text<\/span>;\n- $[8] = t0;\n+ $[9] = t0;\n } else {\n- t0 = $[8];\n+ t0 = $[9];\n }\n t5 = \"\\n \";\n t1 = \"span\";\n@@ -57,35 +57,38 @@ function Component(props) {\n $[2] = t2;\n $[3] = t3;\n $[4] = t4;\n- $[5] = t5;\n- $[6] = t6;\n- $[7] = t7;\n+ $[5] = t0;\n+ $[6] = t5;\n+ $[7] = t6;\n+ $[8] = t7;\n } else {\n t1 = $[1];\n t2 = $[2];\n t3 = $[3];\n t4 = $[4];\n- t5 = $[5];\n- t6 = $[6];\n- t7 = $[7];\n+ t0 = $[5];\n+ t5 = $[6];\n+ t6 = $[7];\n+ t7 = $[8];\n }\n- const c_9 = $[9] !== t1;\n- const c_10 = $[10] !== t2;\n+ const c_10 = $[10] !== t1;\n+ const c_11 = $[11] !== t2;\n let t8;\n- if (c_9 || c_10) {\n+ if (c_10 || c_11) {\n t8 = {t2}<\/t1>;\n- $[9] = t1;\n- $[10] = t2;\n- $[11] = t8;\n+ $[10] = t1;\n+ $[11] = t2;\n+ $[12] = t8;\n } else {\n- t8 = $[11];\n+ t8 = $[12];\n }\n- const c_12 = $[12] !== t3;\n- const c_13 = $[13] !== t4;\n- const c_14 = $[14] !== t5;\n- const c_15 = $[15] !== t8;\n+ const c_13 = $[13] !== t3;\n+ const c_14 = $[14] !== t4;\n+ const c_15 = $[15] !== t0;\n+ const c_16 = $[16] !== t5;\n+ const c_17 = $[17] !== t8;\n let t9;\n- if (c_12 || c_13 || c_14 || c_15) {\n+ if (c_13 || c_14 || c_15 || c_16 || c_17) {\n t9 = (\n \n {t4}\n@@ -94,31 +97,32 @@ function Component(props) {\n {t8}\n <\/t3>\n );\n- $[12] = t3;\n- $[13] = t4;\n- $[14] = t5;\n- $[15] = t8;\n- $[16] = t9;\n+ $[13] = t3;\n+ $[14] = t4;\n+ $[15] = t0;\n+ $[16] = t5;\n+ $[17] = t8;\n+ $[18] = t9;\n } else {\n- t9 = $[16];\n+ t9 = $[18];\n }\n- const c_17 = $[17] !== t6;\n- const c_18 = $[18] !== t7;\n- const c_19 = $[19] !== t9;\n+ const c_19 = $[19] !== t6;\n+ const c_20 = $[20] !== t7;\n+ const c_21 = $[21] !== t9;\n let t10;\n- if (c_17 || c_18 || c_19) {\n+ if (c_19 || c_20 || c_21) {\n t10 = (\n \n {t7}\n {t9}\n <\/t6>\n );\n- $[17] = t6;\n- $[18] = t7;\n- $[19] = t9;\n- $[20] = t10;\n+ $[19] = t6;\n+ $[20] = t7;\n+ $[21] = t9;\n+ $[22] = t10;\n } else {\n- t10 = $[20];\n+ t10 = $[22];\n }\n return t10;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.js\nsimilarity index 100%\nrename from compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-dynamic.js\nrename to compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.js\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md\nsimilarity index 73%\nrename from compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.expect.md\nrename to compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md\nindex 193962c826..ea89b86a49 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md\n@@ -21,11 +21,12 @@ function Component(props) {\n ```javascript\n import * as React from \"react\";\n function Component(props) {\n- const $ = React.unstable_useMemoCache(11);\n+ const $ = React.unstable_useMemoCache(12);\n let t1;\n let t2;\n let t3;\n let t4;\n+ let t0;\n let t5;\n let t6;\n let t7;\n@@ -36,12 +37,11 @@ function Component(props) {\n t7 = \"\\n \";\n t3 = View;\n t4 = \"\\n \";\n- let t0;\n- if ($[7] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ if ($[8] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t0 = Text<\/span>;\n- $[7] = t0;\n+ $[8] = t0;\n } else {\n- t0 = $[7];\n+ t0 = $[8];\n }\n t5 = \"\\n \";\n t1 = \"span\";\n@@ -50,27 +50,29 @@ function Component(props) {\n $[1] = t2;\n $[2] = t3;\n $[3] = t4;\n- $[4] = t5;\n- $[5] = t6;\n- $[6] = t7;\n+ $[4] = t0;\n+ $[5] = t5;\n+ $[6] = t6;\n+ $[7] = t7;\n } else {\n t1 = $[0];\n t2 = $[1];\n t3 = $[2];\n t4 = $[3];\n- t5 = $[4];\n- t6 = $[5];\n- t7 = $[6];\n+ t0 = $[4];\n+ t5 = $[5];\n+ t6 = $[6];\n+ t7 = $[7];\n }\n let t8;\n- if ($[8] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ if ($[9] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t8 = {t2}<\/t1>;\n- $[8] = t8;\n+ $[9] = t8;\n } else {\n- t8 = $[8];\n+ t8 = $[9];\n }\n let t9;\n- if ($[9] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ if ($[10] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t9 = (\n \n {t4}\n@@ -79,21 +81,21 @@ function Component(props) {\n {t8}\n <\/t3>\n );\n- $[9] = t9;\n+ $[10] = t9;\n } else {\n- t9 = $[9];\n+ t9 = $[10];\n }\n let t10;\n- if ($[10] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ if ($[11] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t10 = (\n \n {t7}\n {t9}\n <\/t6>\n );\n- $[10] = t10;\n+ $[11] = t10;\n } else {\n- t10 = $[10];\n+ t10 = $[11];\n }\n return t10;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.js\nsimilarity index 100%\nrename from compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.inner-memo-value-not-promoted-to-outer-scope-static.js\nrename to compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.js\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md\nindex 3a294d07f0..76e3f89f03 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md\n@@ -52,40 +52,42 @@ import * as React from \"react\"; \/\/ This tests an optimization, NOT a correctness\n \/\/ }\n \n function TestJoinCondDepsInUncondScopes(props) {\n- const $ = React.unstable_useMemoCache(7);\n+ const $ = React.unstable_useMemoCache(8);\n const c_0 = $[0] !== props.a.b;\n+ let x;\n let y;\n if (c_0) {\n y = {};\n- const c_2 = $[2] !== props;\n- let x;\n- if (c_2) {\n+ const c_3 = $[3] !== props;\n+ if (c_3) {\n x = {};\n if (foo) {\n mutate1(x, props.a.b);\n }\n- $[2] = props;\n- $[3] = x;\n+ $[3] = props;\n+ $[4] = x;\n } else {\n- x = $[3];\n+ x = $[4];\n }\n \n mutate2(y, props.a.b);\n $[0] = props.a.b;\n- $[1] = y;\n+ $[1] = x;\n+ $[2] = y;\n } else {\n- y = $[1];\n+ x = $[1];\n+ y = $[2];\n }\n- const c_4 = $[4] !== x;\n- const c_5 = $[5] !== y;\n+ const c_5 = $[5] !== x;\n+ const c_6 = $[6] !== y;\n let t0;\n- if (c_4 || c_5) {\n+ if (c_5 || c_6) {\n t0 = [x, y];\n- $[4] = x;\n- $[5] = y;\n- $[6] = t0;\n+ $[5] = x;\n+ $[6] = y;\n+ $[7] = t0;\n } else {\n- t0 = $[6];\n+ t0 = $[7];\n }\n return t0;\n }\n","commit":{"revision":"a0777212df7009cc26e47ffd46444276d0be923d","shortRevision":"a0777212df","authorName":"Joe Savona","authorEmail":"joesavona@fb.com","authoredAt":"2023-04-18T21:27:11-07:00","subject":"Propagate scope declarations to parent scopes"}}

dillon1000/react

Files changed