{"parents":["a0054a18371a5aa1a69a1132f420d69f3c373957"],"body":"","commit":{"subject":"InferReactiveScopes considers all operands, incl terminals","revision":"e51553f5da66794e07fde96118e7816b1b92ea20","shortRevision":"e51553f5da","authorEmail":"joesavona@fb.com","authoredAt":"2022-11-22T14:10:06-08:00","authorName":"Joe Savona"},"files":[{"status":"M","path":"compiler\/forget\/src\/HIR\/HIRTreeVisitor.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/InferReactiveScopes.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/visitors.ts"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/extend-scopes-if.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.js"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-shadowing-within-block.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-shadowing.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-switch.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-while.expect.md"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/HIRTreeVisitor.ts b\/compiler\/forget\/src\/HIR\/HIRTreeVisitor.ts\nindex ad5453bc10..ef26a430c2 100644\n--- a\/compiler\/forget\/src\/HIR\/HIRTreeVisitor.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIRTreeVisitor.ts\n@@ -66,7 +66,9 @@ class Driver {\n switch (terminal.kind) {\n case \"return\": {\n const value =\n- terminal.value != null ? this.visitPlace(terminal.value) : null;\n+ terminal.value != null\n+ ? this.visitPlace(terminal.value, terminal.id)\n+ : null;\n this.visitor.visitTerminalId(terminal.id);\n this.visitor.appendBlock(\n blockValue,\n@@ -78,7 +80,7 @@ class Driver {\n break;\n }\n case \"throw\": {\n- const value = this.visitPlace(terminal.value);\n+ const value = this.visitPlace(terminal.value, terminal.id);\n this.visitor.visitTerminalId(terminal.id);\n this.visitor.appendBlock(\n blockValue,\n@@ -90,7 +92,7 @@ class Driver {\n break;\n }\n case \"if\": {\n- const test = this.visitPlace(terminal.test);\n+ const test = this.visitPlace(terminal.test, terminal.id);\n const fallthroughId =\n terminal.fallthrough !== null &&\n !this.cx.isScheduled(terminal.fallthrough)\n@@ -152,7 +154,7 @@ class Driver {\n break;\n }\n case \"switch\": {\n- const test = this.visitPlace(terminal.test);\n+ const test = this.visitPlace(terminal.test, terminal.id);\n const fallthroughId =\n terminal.fallthrough !== null &&\n !this.cx.isScheduled(terminal.fallthrough)\n@@ -166,7 +168,10 @@ class Driver {\n this.visitor.visitTerminalId(terminal.id);\n const cases: Array = [];\n [...terminal.cases].reverse().forEach((case_, index) => {\n- const test = case_.test !== null ? this.visitPlace(case_.test) : null;\n+ const test =\n+ case_.test !== null\n+ ? this.visitPlace(case_.test, terminal.id)\n+ : null;\n \n let consequent;\n if (this.cx.isScheduled(case_.block)) {\n@@ -241,7 +246,7 @@ class Driver {\n \/\/ body.length === bodyLength,\n \/\/ \"Expected test to produce only temporaries\"\n \/\/ );\n- const testValue = this.visitPlace(testTerminal.test);\n+ const testValue = this.visitPlace(testTerminal.test, terminal.id);\n const fallthroughId =\n terminal.fallthrough !== null &&\n !this.cx.isScheduled(terminal.fallthrough)\n@@ -391,13 +396,13 @@ class Driver {\n }\n \n visitInstr(instr: Instruction, blockValue: TBlock): void {\n- const value = this.visitor.visitValue(instr.value);\n+ const value = this.visitor.visitValue(instr.value, instr.id);\n const item = this.visitor.visitInstruction(instr, value);\n this.visitor.appendBlock(blockValue, item);\n }\n \n- visitPlace(place: Place): TValue {\n- return this.visitor.visitValue(place);\n+ visitPlace(place: Place, id: InstructionId): TValue {\n+ return this.visitor.visitValue(place, id);\n }\n }\n \n@@ -642,7 +647,7 @@ export interface Visitor {\n * Convert an InstructionValue into the visitor's own representation\n * of a value.\n *\/\n- visitValue(value: InstructionValue): TValue;\n+ visitValue(value: InstructionValue, id: InstructionId): TValue;\n \n \/**\n * Convert an Instruction into the visitor's own representation of\ndiff --git a\/compiler\/forget\/src\/HIR\/InferReactiveScopes.ts b\/compiler\/forget\/src\/HIR\/InferReactiveScopes.ts\nindex 94e188f486..3a74f83d12 100644\n--- a\/compiler\/forget\/src\/HIR\/InferReactiveScopes.ts\n+++ b\/compiler\/forget\/src\/HIR\/InferReactiveScopes.ts\n@@ -17,7 +17,10 @@ import {\n ScopeId,\n } from \".\/HIR\";\n import { BlockTerminal, Visitor, visitTree } from \".\/HIRTreeVisitor\";\n-import { eachInstructionOperand } from \".\/visitors\";\n+import {\n+ eachInstructionOperand,\n+ eachInstructionValueOperand,\n+} from \".\/visitors\";\n \n \/**\n * This is a second (final) stage of constructing reactive scopes. Prior to this pass,\n@@ -249,13 +252,28 @@ class MergeOverlappingReactiveScopesVisitor\n enterBlock(): void {\n this.scopes.push(new BlockScope());\n }\n- visitValue(value: InstructionValue): void {}\n- visitInstruction(instruction: Instruction, value: void): void {\n- const scope = getInstructionScope(instruction);\n- if (scope !== null && instruction.id < scope.range.end) {\n- this.visitScope(scope);\n+ visitValue(value: InstructionValue, id: InstructionId): void {\n+ this.visitId(id);\n+ for (const operand of eachInstructionValueOperand(value)) {\n+ if (\n+ operand.identifier.scope !== null &&\n+ id >= operand.identifier.scope.range.start &&\n+ id < operand.identifier.scope.range.end\n+ ) {\n+ this.visitScope(operand.identifier.scope);\n+ }\n }\n+ }\n+ visitInstruction(instruction: Instruction, value: void): void {\n this.visitId(instruction.id);\n+ if (\n+ instruction.lvalue !== null &&\n+ instruction.lvalue.place.identifier.scope !== null &&\n+ instruction.id >= instruction.lvalue.place.identifier.scope.range.start &&\n+ instruction.id < instruction.lvalue.place.identifier.scope.range.end\n+ ) {\n+ this.visitScope(instruction.lvalue.place.identifier.scope);\n+ }\n }\n visitTerminalId(id: InstructionId): void {\n this.visitId(id);\ndiff --git a\/compiler\/forget\/src\/HIR\/visitors.ts b\/compiler\/forget\/src\/HIR\/visitors.ts\nindex d9652c4096..441a27b8ca 100644\n--- a\/compiler\/forget\/src\/HIR\/visitors.ts\n+++ b\/compiler\/forget\/src\/HIR\/visitors.ts\n@@ -10,13 +10,18 @@ import {\n BasicBlock,\n BlockId,\n Instruction,\n+ InstructionValue,\n makeInstructionId,\n Place,\n Terminal,\n } from \".\/HIR\";\n \n export function* eachInstructionOperand(instr: Instruction): Iterable {\n- const instrValue = instr.value;\n+ yield* eachInstructionValueOperand(instr.value);\n+}\n+export function* eachInstructionValueOperand(\n+ instrValue: InstructionValue\n+): Iterable {\n switch (instrValue.kind) {\n case \"NewExpression\":\n case \"CallExpression\": {\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/extend-scopes-if.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/extend-scopes-if.expect.md\nindex a9d8c0750d..1ee3fa4578 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/extend-scopes-if.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/extend-scopes-if.expect.md\n@@ -33,8 +33,8 @@ bb4:\n [4] If (read c$9) then:bb6 else:bb1\n bb6:\n predecessor blocks: bb4\n- [5] Const mutate $11_@0[1:8] = 0\n- [6] Call mutate x$10_@0.push(read $11_@0)\n+ [5] Const mutate $11_@1 = 0\n+ [6] Call mutate x$10_@0.push(read $11_@1)\n [7] Goto bb1\n bb1:\n predecessor blocks: bb6 bb4 bb2 bb0\n@@ -67,8 +67,8 @@ flowchart TB\n end\n subgraph bb6\n bb6_instrs[\"\n- [5] Const mutate $11_@0[1:8] = 0\n- [6] Call mutate x$10_@0.push(read $11_@0)\n+ [5] Const mutate $11_@1 = 0\n+ [6] Call mutate x$10_@0.push(read $11_@1)\n \"]\n bb6_instrs --> bb6_terminal([\"Goto\"])\n end\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.expect.md\nnew file mode 100644\nindex 0000000000..784d287dcc\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.expect.md\n@@ -0,0 +1,72 @@\n+\n+## Input\n+\n+```javascript\n+function foo(a, b, c) {\n+ const x = [];\n+ const y = [];\n+\n+ if (x) {\n+ }\n+\n+ y.push(a);\n+ x.push(b);\n+}\n+\n+```\n+\n+## HIR\n+\n+```\n+bb0:\n+ [1] Const mutate x$9_@0[1:6] = Array []\n+ [2] Const mutate y$10_@0[1:6] = Array []\n+ [3] If (read x$9_@0) then:bb1 else:bb1\n+bb1:\n+ predecessor blocks: bb0\n+ [4] Call mutate y$10_@0.push(read a$6)\n+ [5] Call mutate x$9_@0.push(read b$7)\n+ [6] Return\n+```\n+\n+### CFG\n+\n+```mermaid\n+flowchart TB\n+ %% Basic Blocks\n+ subgraph bb0\n+ bb0_instrs[\"\n+ [1] Const mutate x$9_@0[1:6] = Array []\n+ [2] Const mutate y$10_@0[1:6] = Array []\n+ \"]\n+ bb0_instrs --> bb0_terminal([\"If (read x$9_@0)\"])\n+ end\n+ subgraph bb1\n+ bb1_instrs[\"\n+ [4] Call mutate y$10_@0.push(read a$6)\n+ [5] Call mutate x$9_@0.push(read b$7)\n+ \"]\n+ bb1_instrs --> bb1_terminal([\"Return\"])\n+ end\n+\n+ %% Jumps\n+ bb0_terminal -- \"then\" --> bb1\n+ bb0_terminal -- \"else\" --> bb1\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function foo$0(a$1, b$2, c$3) {\n+ const x$4 = [];\n+ const y$5 = [];\n+ bb1: if (x$4) {\n+ }\n+\n+ y$5.push(a$1);\n+ x$4.push(b$2);\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.js\nnew file mode 100644\nindex 0000000000..66d7e1ce04\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-interleaved-by-terminal.js\n@@ -0,0 +1,10 @@\n+function foo(a, b, c) {\n+ const x = [];\n+ const y = [];\n+\n+ if (x) {\n+ }\n+\n+ y.push(a);\n+ x.push(b);\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-shadowing-within-block.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-shadowing-within-block.expect.md\nindex 0f73e4d141..c34951a726 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-shadowing-within-block.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/overlapping-scopes-shadowing-within-block.expect.md\n@@ -34,8 +34,8 @@ bb4:\n bb3:\n predecessor blocks: bb4 bb2\n [7] Const mutate $13_@2 = \"div\"\n- [8] Const mutate $15_@0[1:11] = JSX {freeze y$12_@1}<\/read $13_@2>\n- [9] Call mutate x$11_@0.push(read $15_@0)\n+ [8] Const mutate $15_@3 = JSX {freeze y$12_@1}<\/read $13_@2>\n+ [9] Call mutate x$11_@0.push(read $15_@3)\n [10] Goto bb1\n bb1:\n predecessor blocks: bb3 bb0\n@@ -68,8 +68,8 @@ flowchart TB\n subgraph bb3\n bb3_instrs[\"\n [7] Const mutate $13_@2 = 'div'\n- [8] Const mutate $15_@0[1:11] = JSX {freeze y$12_@1}<\/read $13_@2>\n- [9] Call mutate x$11_@0.push(read $15_@0)\n+ [8] Const mutate $15_@3 = JSX {freeze y$12_@1}<\/read $13_@2>\n+ [9] Call mutate x$11_@0.push(read $15_@3)\n \"]\n bb3_instrs --> bb3_terminal([\"Goto\"])\n end\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 ab45dd1b9c..e9f4967c3e 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@@ -47,7 +47,7 @@ function log$0() {}\n \n ```\n bb0:\n- [1] Let mutate str$6_@2[0:9] = \"\"\n+ [1] Let mutate str$6_@0[1:8] = \"\"\n [2] If (read cond$5) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n@@ -56,12 +56,12 @@ bb2:\n [5] Goto bb1\n bb3:\n predecessor blocks: bb0\n- [6] Reassign mutate str$8_@2[0:9] = \"fallthrough test\"\n+ [6] Reassign mutate str$8_@0[1:8] = \"fallthrough test\"\n [7] Goto bb1\n bb1:\n predecessor blocks: bb2 bb3\n- str$10_@2[0:9]: phi(bb2: str$6_@2, bb3: str$8_@2)\n- [8] Call mutate log$4_@2(read str$10_@2)\n+ str$10_@0[1:8]: phi(bb2: str$6_@0, bb3: str$8_@0)\n+ [8] Call mutate log$4_@2(read str$10_@0)\n [9] Return\n ```\n \n@@ -72,7 +72,7 @@ flowchart TB\n %% Basic Blocks\n subgraph bb0\n bb0_instrs[\"\n- [1] Let mutate str$6_@2[0:9] = ''\n+ [1] Let mutate str$6_@0[1:8] = ''\n \"]\n bb0_instrs --> bb0_terminal([\"If (read cond$5)\"])\n end\n@@ -85,13 +85,13 @@ flowchart TB\n end\n subgraph bb3\n bb3_instrs[\"\n- [6] Reassign mutate str$8_@2[0:9] = 'fallthrough test'\n+ [6] Reassign mutate str$8_@0[1:8] = 'fallthrough test'\n \"]\n bb3_instrs --> bb3_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [8] Call mutate log$4_@2(read str$10_@2)\n+ [8] Call mutate log$4_@2(read str$10_@0)\n \"]\n bb1_instrs --> bb1_terminal([\"Return\"])\n end\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-switch.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-switch.expect.md\nindex 12e2979b3e..8e89919f48 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-switch.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-switch.expect.md\n@@ -39,23 +39,23 @@ bb0:\n Default: bb2\n bb5:\n predecessor blocks: bb0\n- [7] Const mutate $15_@6[7:17] = 1\n- [8] Reassign mutate x$16_@6[7:17] = Binary read x$10_@0 + read $15_@6\n+ [7] Const mutate $15_@5 = 1\n+ [8] Reassign mutate x$16_@6[8:17] = Binary read x$10_@0 + read $15_@5\n [9] Goto bb1\n bb3:\n predecessor blocks: bb0\n- [10] Const mutate $17_@6[7:17] = 2\n- [11] Reassign mutate x$18_@6[7:17] = Binary read x$10_@0 + read $17_@6\n+ [10] Const mutate $17_@7 = 2\n+ [11] Reassign mutate x$18_@6[8:17] = Binary read x$10_@0 + read $17_@7\n [12] Goto bb1\n bb2:\n predecessor blocks: bb0\n [13] Const mutate $19_@8 = 3\n- [14] Reassign mutate x$20_@6[7:17] = Binary read x$10_@0 + read $19_@8\n+ [14] Reassign mutate x$20_@6[8:17] = Binary read x$10_@0 + read $19_@8\n [15] Goto bb1\n bb1:\n predecessor blocks: bb5 bb3 bb2\n- x$21_@6[7:17]: phi(bb5: x$16_@6, bb3: x$18_@6, bb2: x$20_@6)\n- [16] Let mutate y$22_@6[7:17] = read x$21_@6\n+ x$21_@6[8:17]: phi(bb5: x$16_@6, bb3: x$18_@6, bb2: x$20_@6)\n+ [16] Let mutate y$22_@6[8:17] = read x$21_@6\n [17] Return\n ```\n \n@@ -76,28 +76,28 @@ flowchart TB\n end\n subgraph bb5\n bb5_instrs[\"\n- [7] Const mutate $15_@6[7:17] = 1\n- [8] Reassign mutate x$16_@6[7:17] = Binary read x$10_@0 + read $15_@6\n+ [7] Const mutate $15_@5 = 1\n+ [8] Reassign mutate x$16_@6[8:17] = Binary read x$10_@0 + read $15_@5\n \"]\n bb5_instrs --> bb5_terminal([\"Goto\"])\n end\n subgraph bb3\n bb3_instrs[\"\n- [10] Const mutate $17_@6[7:17] = 2\n- [11] Reassign mutate x$18_@6[7:17] = Binary read x$10_@0 + read $17_@6\n+ [10] Const mutate $17_@7 = 2\n+ [11] Reassign mutate x$18_@6[8:17] = Binary read x$10_@0 + read $17_@7\n \"]\n bb3_instrs --> bb3_terminal([\"Goto\"])\n end\n subgraph bb2\n bb2_instrs[\"\n [13] Const mutate $19_@8 = 3\n- [14] Reassign mutate x$20_@6[7:17] = Binary read x$10_@0 + read $19_@8\n+ [14] Reassign mutate x$20_@6[8:17] = Binary read x$10_@0 + read $19_@8\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [16] Let mutate y$22_@6[7:17] = read x$21_@6\n+ [16] Let mutate y$22_@6[8:17] = read x$21_@6\n \"]\n bb1_instrs --> bb1_terminal([\"Return\"])\n end\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-while.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-while.expect.md\nindex ac19040d62..3516e2b666 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-while.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-while.expect.md\n@@ -27,8 +27,8 @@ bb1:\n [5] If (read $8_@2) then:bb3 else:bb2\n bb3:\n predecessor blocks: bb1\n- [6] Const mutate $9_@0[0:9] = 1\n- [7] Reassign mutate x$10_@0[0:9] = Binary read x$7_@0 + read $9_@0\n+ [6] Const mutate $9_@3 = 1\n+ [7] Reassign mutate x$10_@0[0:9] = Binary read x$7_@0 + read $9_@3\n [8] Goto(Continue) bb1\n bb2:\n predecessor blocks: bb1\n@@ -55,8 +55,8 @@ flowchart TB\n end\n subgraph bb3\n bb3_instrs[\"\n- [6] Const mutate $9_@0[0:9] = 1\n- [7] Reassign mutate x$10_@0[0:9] = Binary read x$7_@0 + read $9_@0\n+ [6] Const mutate $9_@3 = 1\n+ [7] Reassign mutate x$10_@0[0:9] = Binary read x$7_@0 + read $9_@3\n \"]\n bb3_instrs --> bb3_terminal([\"Goto\"])\n end\n"}

dillon1000/react

Files changed