{"body":"","files":[{"status":"M","path":"compiler\/forget\/src\/HIR\/InferMutableLifetimes.ts"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.js"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/mutable-lifetime-loops.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.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.js"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-multiple-if.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-single-if.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple-phi.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-switch.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"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/InferMutableLifetimes.ts b\/compiler\/forget\/src\/HIR\/InferMutableLifetimes.ts\nindex 9a188b0bb8..d2c08f0e78 100644\n--- a\/compiler\/forget\/src\/HIR\/InferMutableLifetimes.ts\n+++ b\/compiler\/forget\/src\/HIR\/InferMutableLifetimes.ts\n@@ -7,7 +7,8 @@\n \n import invariant from \"invariant\";\n import { assertExhaustive } from \"..\/Common\/utils\";\n-import { Effect, HIRFunction, Instruction, Place } from \".\/HIR\";\n+import DisjointSet from \".\/DisjointSet\";\n+import { Effect, HIRFunction, Identifier, Instruction, Place } from \".\/HIR\";\n import { printInstruction, printPlace } from \".\/PrintHIR\";\n import { eachInstructionOperand } from \".\/visitors\";\n \n@@ -76,6 +77,8 @@ function inferPlace(place: Place, instr: Instruction) {\n }\n \n export function inferMutableRanges(func: HIRFunction) {\n+ const aliases = new DisjointSet();\n+\n for (const [_, block] of func.body.blocks) {\n for (const phi of block.phis) {\n let start = Number.MAX_SAFE_INTEGER;\n@@ -100,6 +103,20 @@ export function inferMutableRanges(func: HIRFunction) {\n }\n \n if (instr.lvalue !== null) {\n+ if (instr.value.kind === \"Identifier\") {\n+ \/\/ TODO(gsn): Handle complex aliasing.\n+ if (\n+ instr.value.memberPath === null &&\n+ instr.lvalue.place.memberPath === null\n+ ) {\n+ \/\/ direct aliasing: `a = b`;\n+ aliases.union([\n+ instr.lvalue.place.identifier,\n+ instr.value.identifier,\n+ ]);\n+ }\n+ }\n+\n if (instr.lvalue.place.memberPath === null) {\n const lvalueId = instr.lvalue.place.identifier;\n \n@@ -116,4 +133,45 @@ export function inferMutableRanges(func: HIRFunction) {\n }\n }\n }\n+\n+ const aliasIds: Map = new Map();\n+ \/\/ Store the mutable range and set of identifiers for each scope\n+ const aliasIndentifiers: Map<\n+ number,\n+ { end: number; identifiers: Set }\n+ > = new Map();\n+\n+ aliases.forEach((identifier, groupIdentifier) => {\n+ let aliasId = aliasIds.get(groupIdentifier);\n+ if (aliasId == null) {\n+ aliasId = aliasIds.size;\n+ aliasIds.set(groupIdentifier, aliasId);\n+ }\n+\n+ let alias = aliasIndentifiers.get(aliasId);\n+ if (alias === undefined) {\n+ alias = {\n+ end: identifier.mutableRange.end,\n+ identifiers: new Set(),\n+ };\n+ aliasIndentifiers.set(aliasId, alias);\n+ } else {\n+ alias.end = Math.max(alias.end, identifier.mutableRange.end);\n+ }\n+ alias.identifiers.add(identifier);\n+ });\n+\n+ for (const [_, alias] of aliasIndentifiers) {\n+ \/\/ Update mutableRange.end only if the identifiers have actually been\n+ \/\/ mutated.\n+ const haveIdentifiersBeenMutated = [...alias.identifiers].some(\n+ (id) => id.mutableRange.end > id.mutableRange.start\n+ );\n+\n+ if (haveIdentifiersBeenMutated) {\n+ for (const identifier of alias.identifiers) {\n+ identifier.mutableRange.end = alias.end;\n+ }\n+ }\n+ }\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.expect.md\nnew file mode 100644\nindex 0000000000..6afc2a3c6c\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.expect.md\n@@ -0,0 +1,148 @@\n+\n+## Input\n+\n+```javascript\n+function foo(cond) {\n+ let a = {};\n+ let b = {};\n+ let c = {};\n+ while (cond) {\n+ let z = a;\n+ a = b;\n+ b = c;\n+ c = z;\n+ mutate(a, b);\n+ }\n+ a;\n+ b;\n+ c;\n+ return a;\n+}\n+\n+function mutate(x, y) {}\n+\n+```\n+\n+## HIR\n+\n+```\n+bb0:\n+ [1] Let mutate a$2_@0[0:8] = Object { }\n+ [2] Let mutate b$3_@0[0:8] = Object { }\n+ [3] Let mutate c$4_@0[0:8] = Object { }\n+ While test=bb1 loop=bb3 fallthrough=bb2\n+bb1:\n+ predecessor blocks: bb0 bb3\n+ If (read cond$1) then:bb3 else:bb2\n+bb3:\n+ predecessor blocks: bb1\n+ [4] Let mutate z$5_@0[0:8] = read a$2_@0\n+ [5] Reassign mutate a$2_@0[0:8] = read b$3_@0\n+ [6] Reassign mutate b$3_@0[0:8] = read c$4_@0\n+ [7] Reassign mutate c$4_@0[0:8] = read z$5_@0\n+ [8] Call mutate mutate$6_@0(mutate a$2_@0, mutate b$3_@0)\n+ Goto(Continue) bb1\n+bb2:\n+ predecessor blocks: bb1\n+ [9] read a$2_@0\n+ [10] read b$3_@0\n+ [11] read c$4_@0\n+ Return freeze a$2_@0\n+```\n+\n+### CFG\n+\n+```mermaid\n+flowchart TB\n+ %% Basic Blocks\n+ subgraph bb0\n+ bb0_instrs[\"\n+ [1] Let mutate a$2_@0[0:8] = Object { }\n+ [2] Let mutate b$3_@0[0:8] = Object { }\n+ [3] Let mutate c$4_@0[0:8] = Object { }\n+ \"]\n+ bb0_instrs --> bb0_terminal([\"While\"])\n+ end\n+ subgraph bb1\n+ bb1_terminal([\"If (read cond$1)\"])\n+ end\n+ subgraph bb3\n+ bb3_instrs[\"\n+ [4] Let mutate z$5_@0[0:8] = read a$2_@0\n+ [5] Reassign mutate a$2_@0[0:8] = read b$3_@0\n+ [6] Reassign mutate b$3_@0[0:8] = read c$4_@0\n+ [7] Reassign mutate c$4_@0[0:8] = read z$5_@0\n+ [8] Call mutate mutate$6_@0(mutate a$2_@0, mutate b$3_@0)\n+ \"]\n+ bb3_instrs --> bb3_terminal([\"Goto\"])\n+ end\n+ subgraph bb2\n+ bb2_instrs[\"\n+ [9] read a$2_@0\n+ [10] read b$3_@0\n+ [11] read c$4_@0\n+ \"]\n+ bb2_instrs --> bb2_terminal([\"Return freeze a$2_@0\"])\n+ end\n+\n+ %% Jumps\n+ bb0_terminal -- \"test\" --> bb1\n+ bb0_terminal -- \"loop\" --> bb3\n+ bb0_terminal -- \"fallthrough\" --> bb2\n+ bb1_terminal -- \"then\" --> bb3\n+ bb1_terminal -- \"else\" --> bb2\n+ bb3_terminal --> bb1\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function foo$0(cond$1) {\n+ let a$2 = {};\n+ let b$3 = {};\n+ let c$4 = {};\n+ bb2: while (cond$1) {\n+ let z$5 = a$2;\n+ a$2 = b$3;\n+ b$3 = c$4;\n+ c$4 = z$5;\n+ mutate$6(a$2, b$3);\n+ }\n+\n+ a$2;\n+ b$3;\n+ c$4;\n+ return a$2;\n+}\n+\n+```\n+## HIR\n+\n+```\n+bb0:\n+ Return\n+```\n+\n+### CFG\n+\n+```mermaid\n+flowchart TB\n+ %% Basic Blocks\n+ subgraph bb0\n+ bb0_terminal([\"Return\"])\n+ end\n+\n+ %% Jumps\n+ %% empty\n+```\n+\n+## Code\n+\n+```javascript\n+function mutate$0(x$1, y$2) {\n+ return;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.js\nnew file mode 100644\nindex 0000000000..34aa4c93aa\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/alias-while.js\n@@ -0,0 +1,18 @@\n+function foo(cond) {\n+ let a = {};\n+ let b = {};\n+ let c = {};\n+ while (cond) {\n+ let z = a;\n+ a = b;\n+ b = c;\n+ c = z;\n+ mutate(a, b);\n+ }\n+ a;\n+ b;\n+ c;\n+ return a;\n+}\n+\n+function mutate(x, y) {}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/mutable-lifetime-loops.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/mutable-lifetime-loops.expect.md\nindex 0906af08b6..5e113a89ce 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/mutable-lifetime-loops.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/mutable-lifetime-loops.expect.md\n@@ -101,20 +101,20 @@ function cond$0(x$1) {\n bb0:\n [1] Let mutate a$2_@0[0:14] = Object { }\n [2] Let mutate b$3_@0[0:14] = Object { }\n- [3] Let mutate c$4_@1[0:9] = Object { }\n+ [3] Let mutate c$4_@0[0:14] = Object { }\n [4] Let mutate d$5_@0[0:14] = Object { }\n While test=bb1 loop=bb3 fallthrough=bb2\n bb1:\n predecessor blocks: bb0 bb4\n- [5] Const mutate $10_@2 = true\n- If (read $10_@2) then:bb3 else:bb2\n+ [5] Const mutate $10_@1 = true\n+ If (read $10_@1) then:bb3 else:bb2\n bb3:\n predecessor blocks: bb1\n- [6] Let mutate z$6_@3 = read a$2_@0\n+ [6] Let mutate z$6_@0[0:14] = read a$2_@0\n [7] Reassign mutate a$2_@0[0:14] = read b$3_@0\n- [8] Reassign mutate b$3_@0[0:14] = read c$4_@1\n- [9] Reassign mutate c$4_@1[0:9] = read d$5_@0\n- [10] Reassign mutate d$5_@0[0:14] = read z$6_@3\n+ [8] Reassign mutate b$3_@0[0:14] = read c$4_@0\n+ [9] Reassign mutate c$4_@0[0:14] = read d$5_@0\n+ [10] Reassign mutate d$5_@0[0:14] = read z$6_@0\n [11] Call mutate mutate$7_@0(mutate a$2_@0, mutate b$3_@0)\n [12] Const mutate $9_@0[0:14] = Call mutate cond$8_@0(mutate a$2_@0)\n If (read $9_@0) then:bb2 else:bb4\n@@ -129,14 +129,14 @@ bb7:\n If (read b$3_@0) then:bb9 else:bb9\n bb9:\n predecessor blocks: bb7\n- If (read c$4_@1) then:bb11 else:bb11\n+ If (read c$4_@0) then:bb11 else:bb11\n bb11:\n predecessor blocks: bb9\n If (read d$5_@0) then:bb13 else:bb13\n bb13:\n predecessor blocks: bb11\n- [13] Const mutate $11_@4 = null\n- [14] Call mutate mutate$7_@0(mutate d$5_@0, read $11_@4)\n+ [13] Const mutate $11_@2 = null\n+ [14] Call mutate mutate$7_@0(mutate d$5_@0, read $11_@2)\n Return\n ```\n \n@@ -149,24 +149,24 @@ flowchart TB\n bb0_instrs[\"\n [1] Let mutate a$2_@0[0:14] = Object { }\n [2] Let mutate b$3_@0[0:14] = Object { }\n- [3] Let mutate c$4_@1[0:9] = Object { }\n+ [3] Let mutate c$4_@0[0:14] = Object { }\n [4] Let mutate d$5_@0[0:14] = Object { }\n \"]\n bb0_instrs --> bb0_terminal([\"While\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [5] Const mutate $10_@2 = true\n+ [5] Const mutate $10_@1 = true\n \"]\n- bb1_instrs --> bb1_terminal([\"If (read $10_@2)\"])\n+ bb1_instrs --> bb1_terminal([\"If (read $10_@1)\"])\n end\n subgraph bb3\n bb3_instrs[\"\n- [6] Let mutate z$6_@3 = read a$2_@0\n+ [6] Let mutate z$6_@0[0:14] = read a$2_@0\n [7] Reassign mutate a$2_@0[0:14] = read b$3_@0\n- [8] Reassign mutate b$3_@0[0:14] = read c$4_@1\n- [9] Reassign mutate c$4_@1[0:9] = read d$5_@0\n- [10] Reassign mutate d$5_@0[0:14] = read z$6_@3\n+ [8] Reassign mutate b$3_@0[0:14] = read c$4_@0\n+ [9] Reassign mutate c$4_@0[0:14] = read d$5_@0\n+ [10] Reassign mutate d$5_@0[0:14] = read z$6_@0\n [11] Call mutate mutate$7_@0(mutate a$2_@0, mutate b$3_@0)\n [12] Const mutate $9_@0[0:14] = Call mutate cond$8_@0(mutate a$2_@0)\n \"]\n@@ -182,15 +182,15 @@ flowchart TB\n bb7_terminal([\"If (read b$3_@0)\"])\n end\n subgraph bb9\n- bb9_terminal([\"If (read c$4_@1)\"])\n+ bb9_terminal([\"If (read c$4_@0)\"])\n end\n subgraph bb11\n bb11_terminal([\"If (read d$5_@0)\"])\n end\n subgraph bb13\n bb13_instrs[\"\n- [13] Const mutate $11_@4 = null\n- [14] Call mutate mutate$7_@0(mutate d$5_@0, read $11_@4)\n+ [13] Const mutate $11_@2 = null\n+ [14] Call mutate mutate$7_@0(mutate d$5_@0, read $11_@2)\n \"]\n bb13_instrs --> bb13_terminal([\"Return\"])\n end\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 870d6299c2..7d96a850c1 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@@ -25,7 +25,7 @@ function Component(props) {\n bb0:\n [1] Let mutate x$2_@0[1:4] = Array []\n [2] Call mutate x$2_@0.push(read props$1.p0)\n- [3] Let mutate y$3_@1 = read x$2_@0\n+ [3] Let mutate y$3_@0[1:4] = read x$2_@0\n If (read props$1.p1) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n@@ -33,10 +33,10 @@ bb2:\n Goto bb1\n bb1:\n predecessor blocks: bb2 bb0\n- [5] Let mutate _$4_@2 = JSX <\/read Component$0>\n- [6] Call read y$3_@1.push(read props$1.p2)\n- [7] Const mutate $5_@3 = JSX <\/read Component$0>\n- Return read $5_@3\n+ [5] Let mutate _$4_@1 = JSX <\/read Component$0>\n+ [6] Call read y$3_@0.push(read props$1.p2)\n+ [7] Const mutate $5_@2 = JSX <\/read Component$0>\n+ Return read $5_@2\n ```\n \n ### CFG\n@@ -48,7 +48,7 @@ flowchart TB\n bb0_instrs[\"\n [1] Let mutate x$2_@0[1:4] = Array []\n [2] Call mutate x$2_@0.push(read props$1.p0)\n- [3] Let mutate y$3_@1 = read x$2_@0\n+ [3] Let mutate y$3_@0[1:4] = read x$2_@0\n \"]\n bb0_instrs --> bb0_terminal([\"If (read props$1.p1)\"])\n end\n@@ -60,11 +60,11 @@ flowchart TB\n end\n subgraph bb1\n bb1_instrs[\"\n- [5] Let mutate _$4_@2 = JSX <\/read Component$0>\n- [6] Call read y$3_@1.push(read props$1.p2)\n- [7] Const mutate $5_@3 = JSX <\/read Component$0>\n+ [5] Let mutate _$4_@1 = JSX <\/read Component$0>\n+ [6] Call read y$3_@0.push(read props$1.p2)\n+ [7] Const mutate $5_@2 = JSX <\/read Component$0>\n \"]\n- bb1_instrs --> bb1_terminal([\"Return read $5_@3\"])\n+ bb1_instrs --> bb1_terminal([\"Return read $5_@2\"])\n end\n \n %% Jumps\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md\nindex abcea79bc7..b79ce4f74b 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md\n@@ -21,14 +21,14 @@ function Component(props) {\n \n ```\n bb0:\n- [1] Let mutate x$2_@0[1:2] = Array []\n+ [1] Let mutate x$2_@0[1:6] = Array []\n [2] Call mutate x$2_@0.push(read props$1.p0)\n- [3] Let mutate y$3_@1[3:6] = read x$2_@0\n- [4] Reassign mutate x$2_@2 = Array []\n- [5] Let mutate _$4_@3 = JSX <\/read Component$0>\n- [6] Call mutate y$3_@1.push(read props$1.p1)\n- [7] Const mutate $5_@4 = JSX <\/read Component$0>\n- Return read $5_@4\n+ [3] Let mutate y$3_@0[1:6] = read x$2_@0\n+ [4] Reassign mutate x$2_@1 = Array []\n+ [5] Let mutate _$4_@2 = JSX <\/read Component$0>\n+ [6] Call mutate y$3_@0.push(read props$1.p1)\n+ [7] Const mutate $5_@3 = JSX <\/read Component$0>\n+ Return read $5_@3\n ```\n \n ### CFG\n@@ -38,15 +38,15 @@ flowchart TB\n %% Basic Blocks\n subgraph bb0\n bb0_instrs[\"\n- [1] Let mutate x$2_@0[1:2] = Array []\n+ [1] Let mutate x$2_@0[1:6] = Array []\n [2] Call mutate x$2_@0.push(read props$1.p0)\n- [3] Let mutate y$3_@1[3:6] = read x$2_@0\n- [4] Reassign mutate x$2_@2 = Array []\n- [5] Let mutate _$4_@3 = JSX <\/read Component$0>\n- [6] Call mutate y$3_@1.push(read props$1.p1)\n- [7] Const mutate $5_@4 = JSX <\/read Component$0>\n+ [3] Let mutate y$3_@0[1:6] = read x$2_@0\n+ [4] Reassign mutate x$2_@1 = Array []\n+ [5] Let mutate _$4_@2 = JSX <\/read Component$0>\n+ [6] Call mutate y$3_@0.push(read props$1.p1)\n+ [7] Const mutate $5_@3 = JSX <\/read Component$0>\n \"]\n- bb0_instrs --> bb0_terminal([\"Return read $5_@4\"])\n+ bb0_instrs --> bb0_terminal([\"Return read $5_@3\"])\n end\n \n %% Jumps\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.expect.md\nnew file mode 100644\nindex 0000000000..e937473a7b\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.expect.md\n@@ -0,0 +1,98 @@\n+\n+## Input\n+\n+```javascript\n+function mutate() {}\n+function foo() {\n+ let a = {};\n+ let b = {};\n+ let c = {};\n+ a = b;\n+ b = c;\n+ c = a;\n+ mutate(a, b);\n+ return c;\n+}\n+\n+```\n+\n+## HIR\n+\n+```\n+bb0:\n+ Return\n+```\n+\n+### CFG\n+\n+```mermaid\n+flowchart TB\n+ %% Basic Blocks\n+ subgraph bb0\n+ bb0_terminal([\"Return\"])\n+ end\n+\n+ %% Jumps\n+ %% empty\n+```\n+\n+## Code\n+\n+```javascript\n+function mutate$0() {\n+ return;\n+}\n+\n+```\n+## HIR\n+\n+```\n+bb0:\n+ [1] Let mutate a$1_@0 = Object { }\n+ [2] Let mutate b$2_@1[0:7] = Object { }\n+ [3] Let mutate c$3_@1[0:7] = Object { }\n+ [4] Reassign mutate a$1_@1[0:7] = read b$2_@1\n+ [5] Reassign mutate b$2_@1[0:7] = read c$3_@1\n+ [6] Reassign mutate c$3_@1[0:7] = read a$1_@1\n+ [7] Call mutate mutate$4_@1(mutate a$1_@1, mutate b$2_@1)\n+ Return freeze c$3_@1\n+```\n+\n+### CFG\n+\n+```mermaid\n+flowchart TB\n+ %% Basic Blocks\n+ subgraph bb0\n+ bb0_instrs[\"\n+ [1] Let mutate a$1_@0 = Object { }\n+ [2] Let mutate b$2_@1[0:7] = Object { }\n+ [3] Let mutate c$3_@1[0:7] = Object { }\n+ [4] Reassign mutate a$1_@1[0:7] = read b$2_@1\n+ [5] Reassign mutate b$2_@1[0:7] = read c$3_@1\n+ [6] Reassign mutate c$3_@1[0:7] = read a$1_@1\n+ [7] Call mutate mutate$4_@1(mutate a$1_@1, mutate b$2_@1)\n+ \"]\n+ bb0_instrs --> bb0_terminal([\"Return freeze c$3_@1\"])\n+ end\n+\n+ %% Jumps\n+ %% empty\n+```\n+\n+## Code\n+\n+```javascript\n+function foo$0() {\n+ let a$1 = {};\n+ let b$2 = {};\n+ let c$3 = {};\n+ a$1 = b$2;\n+ b$2 = c$3;\n+ c$3 = a$1;\n+ mutate$4(a$1, b$2);\n+ return c$3;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.js\nnew file mode 100644\nindex 0000000000..f57584af69\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-alias.js\n@@ -0,0 +1,11 @@\n+function mutate() {}\n+function foo() {\n+ let a = {};\n+ let b = {};\n+ let c = {};\n+ a = b;\n+ b = c;\n+ c = a;\n+ mutate(a, b);\n+ return c;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-multiple-if.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-multiple-if.expect.md\nindex d8a758a76a..7ad778d40d 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-multiple-if.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-multiple-if.expect.md\n@@ -21,14 +21,14 @@ function foo() {\n \n ```\n bb0:\n- [1] Let mutate x$1_@0[1:8] = 1\n+ [1] Let mutate x$1_@0[1:9] = 1\n [2] Let mutate y$2_@1 = 2\n [3] Const mutate $3_@2 = 2\n [4] Const mutate $4_@3 = Binary read y$2_@1 === read $3_@2\n If (read $4_@3) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- [5] Reassign mutate x$1_@0[1:8] = 3\n+ [5] Reassign mutate x$1_@0[1:9] = 3\n Goto bb1\n bb1:\n predecessor blocks: bb2 bb0\n@@ -37,11 +37,11 @@ bb1:\n If (read $6_@5) then:bb4 else:bb3\n bb4:\n predecessor blocks: bb1\n- [8] Reassign mutate x$1_@0[1:8] = 5\n+ [8] Reassign mutate x$1_@0[1:9] = 5\n Goto bb3\n bb3:\n predecessor blocks: bb4 bb1\n- [9] Reassign mutate y$2_@6 = read x$1_@0\n+ [9] Reassign mutate y$2_@0[1:9] = read x$1_@0\n Return\n ```\n \n@@ -52,7 +52,7 @@ flowchart TB\n %% Basic Blocks\n subgraph bb0\n bb0_instrs[\"\n- [1] Let mutate x$1_@0[1:8] = 1\n+ [1] Let mutate x$1_@0[1:9] = 1\n [2] Let mutate y$2_@1 = 2\n [3] Const mutate $3_@2 = 2\n [4] Const mutate $4_@3 = Binary read y$2_@1 === read $3_@2\n@@ -61,7 +61,7 @@ flowchart TB\n end\n subgraph bb2\n bb2_instrs[\"\n- [5] Reassign mutate x$1_@0[1:8] = 3\n+ [5] Reassign mutate x$1_@0[1:9] = 3\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n@@ -74,13 +74,13 @@ flowchart TB\n end\n subgraph bb4\n bb4_instrs[\"\n- [8] Reassign mutate x$1_@0[1:8] = 5\n+ [8] Reassign mutate x$1_@0[1:9] = 5\n \"]\n bb4_instrs --> bb4_terminal([\"Goto\"])\n end\n subgraph bb3\n bb3_instrs[\"\n- [9] Reassign mutate y$2_@6 = read x$1_@0\n+ [9] Reassign mutate y$2_@0[1:9] = read x$1_@0\n \"]\n bb3_instrs --> bb3_terminal([\"Return\"])\n end\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-single-if.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-single-if.expect.md\nindex 9217f2f6b7..7204e90191 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-single-if.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-complex-single-if.expect.md\n@@ -18,18 +18,18 @@ function foo() {\n \n ```\n bb0:\n- [1] Let mutate x$1_@0[1:5] = 1\n+ [1] Let mutate x$1_@0[1:6] = 1\n [2] Let mutate y$2_@1 = 2\n [3] Const mutate $3_@2 = 2\n [4] Const mutate $4_@3 = Binary read y$2_@1 === read $3_@2\n If (read $4_@3) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- [5] Reassign mutate x$1_@0[1:5] = 3\n+ [5] Reassign mutate x$1_@0[1:6] = 3\n Goto bb1\n bb1:\n predecessor blocks: bb2 bb0\n- [6] Reassign mutate y$2_@4 = read x$1_@0\n+ [6] Reassign mutate y$2_@0[1:6] = read x$1_@0\n Return\n ```\n \n@@ -40,7 +40,7 @@ flowchart TB\n %% Basic Blocks\n subgraph bb0\n bb0_instrs[\"\n- [1] Let mutate x$1_@0[1:5] = 1\n+ [1] Let mutate x$1_@0[1:6] = 1\n [2] Let mutate y$2_@1 = 2\n [3] Const mutate $3_@2 = 2\n [4] Const mutate $4_@3 = Binary read y$2_@1 === read $3_@2\n@@ -49,13 +49,13 @@ flowchart TB\n end\n subgraph bb2\n bb2_instrs[\"\n- [5] Reassign mutate x$1_@0[1:5] = 3\n+ [5] Reassign mutate x$1_@0[1:6] = 3\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [6] Reassign mutate y$2_@4 = read x$1_@0\n+ [6] Reassign mutate y$2_@0[1:6] = read x$1_@0\n \"]\n bb1_instrs --> bb1_terminal([\"Return\"])\n end\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple-phi.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple-phi.expect.md\nindex c12b5146d5..8229101d05 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple-phi.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple-phi.expect.md\n@@ -26,15 +26,15 @@ bb0:\n If (read $3_@2) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n- [4] Reassign mutate y$1_@3[4:5] = 1\n+ [4] Reassign mutate y$1_@3[4:6] = 1\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- [5] Reassign mutate y$1_@3[4:5] = 2\n+ [5] Reassign mutate y$1_@3[4:6] = 2\n Goto bb1\n bb1:\n predecessor blocks: bb2 bb3\n- [6] Let mutate x$4_@4 = read y$1_@3\n+ [6] Let mutate x$4_@3[4:6] = read y$1_@3\n Return\n ```\n \n@@ -53,19 +53,19 @@ flowchart TB\n end\n subgraph bb2\n bb2_instrs[\"\n- [4] Reassign mutate y$1_@3[4:5] = 1\n+ [4] Reassign mutate y$1_@3[4:6] = 1\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n subgraph bb3\n bb3_instrs[\"\n- [5] Reassign mutate y$1_@3[4:5] = 2\n+ [5] Reassign mutate y$1_@3[4:6] = 2\n \"]\n bb3_instrs --> bb3_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [6] Let mutate x$4_@4 = read y$1_@3\n+ [6] Let mutate x$4_@3[4:6] = read y$1_@3\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 b76bd23106..97d2ebe4e4 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@@ -40,21 +40,21 @@ bb0:\n bb5:\n predecessor blocks: bb0\n [6] Const mutate $6_@5 = 1\n- [7] Reassign mutate x$1_@6[7:11] = Binary read x$1_@0 + read $6_@5\n+ [7] Reassign mutate x$1_@6[7:12] = Binary read x$1_@0 + read $6_@5\n Goto bb1\n bb3:\n predecessor blocks: bb0\n [8] Const mutate $3_@7 = 2\n- [9] Reassign mutate x$1_@6[7:11] = Binary read x$1_@0 + read $3_@7\n+ [9] Reassign mutate x$1_@6[7:12] = Binary read x$1_@0 + read $3_@7\n Goto bb1\n bb2:\n predecessor blocks: bb0\n [10] Const mutate $2_@8 = 3\n- [11] Reassign mutate x$1_@6[7:11] = Binary read x$1_@0 + read $2_@8\n+ [11] Reassign mutate x$1_@6[7:12] = Binary read x$1_@0 + read $2_@8\n Goto bb1\n bb1:\n predecessor blocks: bb5 bb3 bb2\n- [12] Let mutate y$9_@9 = read x$1_@6\n+ [12] Let mutate y$9_@6[7:12] = read x$1_@6\n Return\n ```\n \n@@ -76,27 +76,27 @@ flowchart TB\n subgraph bb5\n bb5_instrs[\"\n [6] Const mutate $6_@5 = 1\n- [7] Reassign mutate x$1_@6[7:11] = Binary read x$1_@0 + read $6_@5\n+ [7] Reassign mutate x$1_@6[7:12] = Binary read x$1_@0 + read $6_@5\n \"]\n bb5_instrs --> bb5_terminal([\"Goto\"])\n end\n subgraph bb3\n bb3_instrs[\"\n [8] Const mutate $3_@7 = 2\n- [9] Reassign mutate x$1_@6[7:11] = Binary read x$1_@0 + read $3_@7\n+ [9] Reassign mutate x$1_@6[7:12] = Binary read x$1_@0 + read $3_@7\n \"]\n bb3_instrs --> bb3_terminal([\"Goto\"])\n end\n subgraph bb2\n bb2_instrs[\"\n [10] Const mutate $2_@8 = 3\n- [11] Reassign mutate x$1_@6[7:11] = Binary read x$1_@0 + read $2_@8\n+ [11] Reassign mutate x$1_@6[7:12] = Binary read x$1_@0 + read $2_@8\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [12] Let mutate y$9_@9 = read x$1_@6\n+ [12] Let mutate y$9_@6[7:12] = read x$1_@6\n \"]\n bb1_instrs --> bb1_terminal([\"Return\"])\n end\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 0056448aa4..e4a9e413dc 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@@ -32,31 +32,31 @@ function Component(props) {\n \n ```\n bb0:\n- [1] Let mutate x$2_@0[1:6] = Array []\n- [2] Let mutate y$3_@1[2:8] = undefined\n- [3] Const mutate $4_@2 = false\n- [4] Const mutate $5_@3 = true\n- [5] Const mutate $6_@4 = 1\n+ [1] Let mutate x$2_@0[1:8] = Array []\n+ [2] Let mutate y$3_@0[1:8] = undefined\n+ [3] Const mutate $4_@1 = false\n+ [4] Const mutate $5_@2 = true\n+ [5] Const mutate $6_@3 = 1\n Switch (read props$1.p0)\n- Case read $6_@4: bb1\n- Case read $5_@3: bb6\n+ Case read $6_@3: bb1\n+ Case read $5_@2: bb6\n Default: bb1\n- Case read $4_@2: bb2\n+ Case read $4_@1: bb2\n bb6:\n predecessor blocks: bb0\n [6] Call mutate x$2_@0.push(read props$1.p2)\n- [7] Reassign mutate y$3_@1[2:8] = Array []\n+ [7] Reassign mutate y$3_@0[1:8] = Array []\n Goto bb1\n bb2:\n predecessor blocks: bb0\n- [8] Reassign mutate y$3_@1[2:8] = read x$2_@0\n+ [8] Reassign mutate y$3_@0[1:8] = read x$2_@0\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb6 bb2\n- [9] Const mutate child$7_@5 = JSX <\/read Component$0>\n- [10] Call read y$3_@1.push(read props$1.p4)\n- [11] Const mutate $8_@6 = JSX {read child$7_@5}<\/read Component$0>\n- Return read $8_@6\n+ [9] Const mutate child$7_@4 = JSX <\/read Component$0>\n+ [10] Call read y$3_@0.push(read props$1.p4)\n+ [11] Const mutate $8_@5 = JSX {read child$7_@4}<\/read Component$0>\n+ Return read $8_@5\n ```\n \n ### CFG\n@@ -66,41 +66,41 @@ flowchart TB\n %% Basic Blocks\n subgraph bb0\n bb0_instrs[\"\n- [1] Let mutate x$2_@0[1:6] = Array []\n- [2] Let mutate y$3_@1[2:8] = undefined\n- [3] Const mutate $4_@2 = false\n- [4] Const mutate $5_@3 = true\n- [5] Const mutate $6_@4 = 1\n+ [1] Let mutate x$2_@0[1:8] = Array []\n+ [2] Let mutate y$3_@0[1:8] = undefined\n+ [3] Const mutate $4_@1 = false\n+ [4] Const mutate $5_@2 = true\n+ [5] Const mutate $6_@3 = 1\n \"]\n bb0_instrs --> bb0_terminal([\"Switch (read props$1.p0)\"])\n end\n subgraph bb6\n bb6_instrs[\"\n [6] Call mutate x$2_@0.push(read props$1.p2)\n- [7] Reassign mutate y$3_@1[2:8] = Array []\n+ [7] Reassign mutate y$3_@0[1:8] = Array []\n \"]\n bb6_instrs --> bb6_terminal([\"Goto\"])\n end\n subgraph bb2\n bb2_instrs[\"\n- [8] Reassign mutate y$3_@1[2:8] = read x$2_@0\n+ [8] Reassign mutate y$3_@0[1:8] = read x$2_@0\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [9] Const mutate child$7_@5 = JSX <\/read Component$0>\n- [10] Call read y$3_@1.push(read props$1.p4)\n- [11] Const mutate $8_@6 = JSX {read child$7_@5}<\/read Component$0>\n+ [9] Const mutate child$7_@4 = JSX <\/read Component$0>\n+ [10] Call read y$3_@0.push(read props$1.p4)\n+ [11] Const mutate $8_@5 = JSX {read child$7_@4}<\/read Component$0>\n \"]\n- bb1_instrs --> bb1_terminal([\"Return read $8_@6\"])\n+ bb1_instrs --> bb1_terminal([\"Return read $8_@5\"])\n end\n \n %% Jumps\n- bb0_terminal -- \"read $6_@4\" --> bb1\n- bb0_terminal -- \"read $5_@3\" --> bb6\n+ bb0_terminal -- \"read $6_@3\" --> bb1\n+ bb0_terminal -- \"read $5_@2\" --> bb6\n bb0_terminal -- \"default\" --> bb1\n- bb0_terminal -- \"read $4_@2\" --> bb2\n+ bb0_terminal -- \"read $4_@1\" --> bb2\n bb0_terminal -- \"fallthrough\" --> bb1\n bb6_terminal --> bb1\n bb2_terminal --> bb1\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md\nindex 3a7075357b..e45f168b89 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch.expect.md\n@@ -28,30 +28,30 @@ function Component(props) {\n \n ```\n bb0:\n- [1] Let mutate x$2_@0[1:6] = Array []\n- [2] Let mutate y$3_@1[2:8] = undefined\n- [3] Const mutate $4_@2 = false\n- [4] Const mutate $5_@3 = true\n+ [1] Let mutate x$2_@0[1:8] = Array []\n+ [2] Let mutate y$3_@0[1:8] = undefined\n+ [3] Const mutate $4_@1 = false\n+ [4] Const mutate $5_@2 = true\n Switch (read props$1.p0)\n- Case read $5_@3: bb4\n- Case read $4_@2: bb2\n+ Case read $5_@2: bb4\n+ Case read $4_@1: bb2\n Default: bb1\n bb4:\n predecessor blocks: bb0\n [5] Call mutate x$2_@0.push(read props$1.p2)\n [6] Call mutate x$2_@0.push(read props$1.p3)\n- [7] Reassign mutate y$3_@4 = Array []\n+ [7] Reassign mutate y$3_@3 = Array []\n Goto bb2\n bb2:\n predecessor blocks: bb4 bb0\n- [8] Reassign mutate y$3_@1[2:8] = read x$2_@0\n+ [8] Reassign mutate y$3_@0[1:8] = read x$2_@0\n Goto bb1\n bb1:\n predecessor blocks: bb2 bb0\n- [9] Const mutate child$6_@5 = JSX <\/read Component$0>\n- [10] Call read y$3_@1.push(read props$1.p4)\n- [11] Const mutate $7_@6 = JSX {read child$6_@5}<\/read Component$0>\n- Return read $7_@6\n+ [9] Const mutate child$6_@4 = JSX <\/read Component$0>\n+ [10] Call read y$3_@0.push(read props$1.p4)\n+ [11] Const mutate $7_@5 = JSX {read child$6_@4}<\/read Component$0>\n+ Return read $7_@5\n ```\n \n ### CFG\n@@ -61,10 +61,10 @@ flowchart TB\n %% Basic Blocks\n subgraph bb0\n bb0_instrs[\"\n- [1] Let mutate x$2_@0[1:6] = Array []\n- [2] Let mutate y$3_@1[2:8] = undefined\n- [3] Const mutate $4_@2 = false\n- [4] Const mutate $5_@3 = true\n+ [1] Let mutate x$2_@0[1:8] = Array []\n+ [2] Let mutate y$3_@0[1:8] = undefined\n+ [3] Const mutate $4_@1 = false\n+ [4] Const mutate $5_@2 = true\n \"]\n bb0_instrs --> bb0_terminal([\"Switch (read props$1.p0)\"])\n end\n@@ -72,28 +72,28 @@ flowchart TB\n bb4_instrs[\"\n [5] Call mutate x$2_@0.push(read props$1.p2)\n [6] Call mutate x$2_@0.push(read props$1.p3)\n- [7] Reassign mutate y$3_@4 = Array []\n+ [7] Reassign mutate y$3_@3 = Array []\n \"]\n bb4_instrs --> bb4_terminal([\"Goto\"])\n end\n subgraph bb2\n bb2_instrs[\"\n- [8] Reassign mutate y$3_@1[2:8] = read x$2_@0\n+ [8] Reassign mutate y$3_@0[1:8] = read x$2_@0\n \"]\n bb2_instrs --> bb2_terminal([\"Goto\"])\n end\n subgraph bb1\n bb1_instrs[\"\n- [9] Const mutate child$6_@5 = JSX <\/read Component$0>\n- [10] Call read y$3_@1.push(read props$1.p4)\n- [11] Const mutate $7_@6 = JSX {read child$6_@5}<\/read Component$0>\n+ [9] Const mutate child$6_@4 = JSX <\/read Component$0>\n+ [10] Call read y$3_@0.push(read props$1.p4)\n+ [11] Const mutate $7_@5 = JSX {read child$6_@4}<\/read Component$0>\n \"]\n- bb1_instrs --> bb1_terminal([\"Return read $7_@6\"])\n+ bb1_instrs --> bb1_terminal([\"Return read $7_@5\"])\n end\n \n %% Jumps\n- bb0_terminal -- \"read $5_@3\" --> bb4\n- bb0_terminal -- \"read $4_@2\" --> bb2\n+ bb0_terminal -- \"read $5_@2\" --> bb4\n+ bb0_terminal -- \"read $4_@1\" --> bb2\n bb0_terminal -- \"default\" --> bb1\n bb0_terminal -- \"fallthrough\" --> bb1\n bb4_terminal --> bb2\n","commit":{"subject":"[hir] Handle simple aliases when inferring mutable lifetimes (#794)","shortRevision":"584eff2d38","revision":"584eff2d38670dcfb98d947b3db39dfb06f6cabb","authoredAt":"2022-11-21T18:35:14+00:00","authorName":"Sathya Gunasekaran","authorEmail":"gsathya.ceg@gmail.com"},"parents":["43686787a0b9f62d896037485a2d7e8d9601fccf"]}

dillon1000/react

Files changed