{"files":[{"status":"M","path":"compiler\/forget\/src\/HIR\/SSAify.ts"},{"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-if-else.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-objectexpression-phi.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-return.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\/ssa-throw.expect.md"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/SSAify.ts b\/compiler\/forget\/src\/HIR\/SSAify.ts\nindex ec2e3a6ede..984ec93d24 100644\n--- a\/compiler\/forget\/src\/HIR\/SSAify.ts\n+++ b\/compiler\/forget\/src\/HIR\/SSAify.ts\n@@ -165,11 +165,11 @@ class SSABuilder {\n \n export default function buildSSA(func: HIRFunction, env: Environment) {\n const builder = new SSABuilder(env);\n- function visit(blockId: BlockId) {\n- const block = func.body.blocks.get(blockId)!;\n- if (builder.visitedBlocks.has(block)) {\n- return;\n- }\n+ for (const [blockId, block] of func.body.blocks) {\n+ invariant(\n+ !builder.visitedBlocks.has(block),\n+ `found a cycle! visiting bb${block.id} again`\n+ );\n builder.visitedBlocks.add(block);\n \n builder.startBlock(block);\n@@ -208,13 +208,7 @@ export default function buildSSA(func: HIRFunction, env: Environment) {\n builder.fixIncompletePhis(output);\n }\n }\n-\n- for (const output of outputs) {\n- visit(output);\n- }\n }\n-\n- visit(func.body.entry);\n }\n \n function rewriteUsesAndCollectOutputs(\n@@ -245,7 +239,7 @@ function rewriteUsesAndCollectOutputs(\n case \"switch\": {\n const { cases } = terminal;\n terminal.test = builder.getPlace(terminal.test);\n- for (const case_ of [...cases].reverse()) {\n+ for (const case_ of [...cases]) {\n if (case_.test) {\n case_.test = builder.getPlace(case_.test);\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 f2645a899d..e2e54e6a7e 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@@ -28,23 +28,23 @@ bb0:\n If (read $10) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$18 = 3\n+ Reassign mutate x$11 = 3\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- y$12: phi(bb0: y$8, bb2: y$8)\n- x$17: phi(bb0: x$7, bb2: x$18)\n- Const mutate $11 = 3\n- Const mutate $13 = Binary read y$12 === read $11\n- If (read $13) then:bb4 else:bb3\n+ y$13: phi(bb0: y$8, bb2: y$8)\n+ x$17: phi(bb0: x$7, bb2: x$11)\n+ Const mutate $12 = 3\n+ Const mutate $14 = Binary read y$13 === read $12\n+ If (read $14) then:bb4 else:bb3\n bb4:\n predecessor blocks: bb1\n- Reassign mutate x$16 = 5\n+ Reassign mutate x$15 = 5\n Goto bb3\n bb3:\n predecessor blocks: bb1 bb4\n- x$14: phi(bb1: x$17, bb4: x$16)\n- Reassign mutate y$15 = read x$14\n+ x$16: phi(bb1: x$17, bb4: x$15)\n+ Reassign mutate y$18 = read x$16\n Return\n ```\n \n@@ -55,16 +55,16 @@ function foo$0() {\n let x$7 = 1;\n let y$8 = 2;\n if (y$8 === 2) {\n- x$18 = 3;\n+ x$11 = 3;\n (\"<>\");\n }\n \n- if (y$12 === 3) {\n- x$16 = 5;\n+ if (y$13 === 3) {\n+ x$15 = 5;\n (\"<>\");\n }\n \n- y$15 = x$14;\n+ y$18 = x$16;\n return;\n }\n \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 c0d9ee8994..4a62eaf600 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@@ -25,12 +25,12 @@ bb0:\n If (read $8) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$11 = 3\n+ Reassign mutate x$9 = 3\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- x$9: phi(bb0: x$5, bb2: x$11)\n- Reassign mutate y$10 = read x$9\n+ x$10: phi(bb0: x$5, bb2: x$9)\n+ Reassign mutate y$11 = read x$10\n Return\n ```\n \n@@ -41,11 +41,11 @@ function foo$0() {\n let x$5 = 1;\n let y$6 = 2;\n if (y$6 === 2) {\n- x$11 = 3;\n+ x$9 = 3;\n (\"<>\");\n }\n \n- y$10 = x$9;\n+ y$11 = x$10;\n return;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-if-else.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-if-else.expect.md\nindex 093e804a89..13a758602d 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-if-else.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-if-else.expect.md\n@@ -24,11 +24,11 @@ bb0:\n If (read y$6) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n- Let mutate z$8 = Binary read x$5 + read y$6\n+ Let mutate z$7 = Binary read x$5 + read y$6\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Let mutate z$7 = read x$5\n+ Let mutate z$8 = read x$5\n Goto bb1\n bb1:\n predecessor blocks: bb3 bb2\n@@ -42,10 +42,10 @@ function foo$0() {\n let x$5 = 1;\n let y$6 = 2;\n if (y$6) {\n- let z$8 = x$5 + y$6;\n+ let z$7 = x$5 + y$6;\n (\"<>\");\n } else {\n- let z$7 = x$5;\n+ let z$8 = x$5;\n (\"<>\");\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-objectexpression-phi.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-objectexpression-phi.expect.md\nindex f07f39dbc7..de9c059128 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-objectexpression-phi.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-objectexpression-phi.expect.md\n@@ -29,18 +29,18 @@ bb0:\n If (read $9) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$14 = 2\n+ Reassign mutate x$10 = 2\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Reassign mutate y$10 = 3\n+ Reassign mutate y$11 = 3\n Goto bb1\n bb1:\n predecessor blocks: bb3 bb2\n- x$11: phi(bb3: x$6, bb2: x$14)\n- y$12: phi(bb3: y$10, bb2: y$7)\n- Let mutate t$13 = Object { x: read x$11, y: read y$12 }\n- Return freeze t$13\n+ x$12: phi(bb3: x$6, bb2: x$10)\n+ y$13: phi(bb3: y$11, bb2: y$7)\n+ Let mutate t$14 = Object { x: read x$12, y: read y$13 }\n+ Return freeze t$14\n ```\n \n ## Code\n@@ -50,18 +50,18 @@ function foo$0() {\n let x$6 = 1;\n let y$7 = 2;\n if (x$6 > 1) {\n- x$14 = 2;\n+ x$10 = 2;\n (\"<>\");\n } else {\n- y$10 = 3;\n+ y$11 = 3;\n (\"<>\");\n }\n \n- let t$13 = {\n- x: x$11,\n- y: y$12,\n+ let t$14 = {\n+ x: x$12,\n+ y: y$13,\n };\n- return t$13;\n+ return t$14;\n }\n \n ```\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-return.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-return.expect.md\nindex 903e21e10d..4bf1b0294f 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-return.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-return.expect.md\n@@ -23,12 +23,12 @@ bb0:\n If (read $6) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$8 = 2\n+ Reassign mutate x$7 = 2\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- x$7: phi(bb0: x$4, bb2: x$8)\n- Return read x$7\n+ x$8: phi(bb0: x$4, bb2: x$7)\n+ Return read x$8\n ```\n \n ## Code\n@@ -37,11 +37,11 @@ bb1:\n function foo$0() {\n let x$4 = 1;\n if (x$4 === 1) {\n- x$8 = 2;\n+ x$7 = 2;\n (\"<>\");\n }\n \n- return x$7;\n+ return x$8;\n }\n \n ```\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 e45cdabb4f..11c54248d1 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,16 +26,16 @@ bb0:\n If (read $7) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n- Reassign mutate y$11 = 1\n+ Reassign mutate y$8 = 1\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Reassign mutate y$8 = 2\n+ Reassign mutate y$9 = 2\n Goto bb1\n bb1:\n predecessor blocks: bb3 bb2\n- y$9: phi(bb3: y$8, bb2: y$11)\n- Let mutate x$10 = read y$9\n+ y$10: phi(bb3: y$9, bb2: y$8)\n+ Let mutate x$11 = read y$10\n Return\n ```\n \n@@ -45,14 +45,14 @@ bb1:\n function foo$0() {\n let y$5 = 2;\n if (y$5 > 1) {\n- y$11 = 1;\n+ y$8 = 1;\n (\"<>\");\n } else {\n- y$8 = 2;\n+ y$9 = 2;\n (\"<>\");\n }\n \n- let x$10 = y$9;\n+ let x$11 = y$10;\n return;\n }\n \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 9d54b2ee40..537adb4939 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- Const mutate $21 = 1\n- Reassign mutate x$22 = Binary read x$10 + read $21\n+ Const mutate $15 = 1\n+ Reassign mutate x$16 = Binary read x$10 + read $15\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Const mutate $19 = 2\n- Reassign mutate x$20 = Binary read x$10 + read $19\n+ Const mutate $17 = 2\n+ Reassign mutate x$18 = Binary read x$10 + read $17\n Goto bb1\n bb2:\n predecessor blocks: bb0\n- Const mutate $15 = 3\n- Reassign mutate x$16 = Binary read x$10 + read $15\n+ Const mutate $19 = 3\n+ Reassign mutate x$20 = Binary read x$10 + read $19\n Goto bb1\n bb1:\n predecessor blocks: bb5 bb3 bb2\n- x$17: phi(bb5: x$22, bb3: x$20, bb2: x$16)\n- Let mutate y$18 = read x$17\n+ x$21: phi(bb5: x$16, bb3: x$18, bb2: x$20)\n+ Let mutate y$22 = read x$21\n Return\n ```\n \n@@ -66,22 +66,22 @@ function foo$0() {\n let x$10 = 1;\n switch (x$10) {\n case x$10 === 1: {\n- x$22 = x$10 + 1;\n+ x$16 = x$10 + 1;\n (\"<>\");\n }\n \n case x$10 === 2: {\n- x$20 = x$10 + 2;\n+ x$18 = x$10 + 2;\n (\"<>\");\n }\n \n default: {\n- x$16 = x$10 + 3;\n+ x$20 = x$10 + 3;\n (\"<>\");\n }\n }\n \n- let y$18 = x$17;\n+ let y$22 = x$21;\n return;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-throw.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-throw.expect.md\nindex e2d0a00e33..5b5dfc127a 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-throw.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-throw.expect.md\n@@ -22,12 +22,12 @@ bb0:\n If (read $6) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$8 = 2\n+ Reassign mutate x$7 = 2\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- x$7: phi(bb0: x$4, bb2: x$8)\n- Throw read x$7\n+ x$8: phi(bb0: x$4, bb2: x$7)\n+ Throw read x$8\n ```\n \n ## Code\n@@ -36,11 +36,11 @@ bb1:\n function foo$0() {\n let x$4 = 1;\n if (x$4 === 1) {\n- x$8 = 2;\n+ x$7 = 2;\n (\"<>\");\n }\n \n- throw x$7;\n+ throw x$8;\n }\n \n ```\n","commit":{"authorEmail":"gsathya.ceg@gmail.com","authoredAt":"2022-10-27T16:43:28+01:00","subject":"[ssa] Run SSA in RPO traversal","revision":"fd6cb34843f0c3d4b71ca354352fa7156584403b","authorName":"Sathya Gunasekaran","shortRevision":"fd6cb34843"},"body":"This prevents us from looking up state in blocks that have not been visited.","parents":["15104ab21bcc4848fdb5be5c1773ced5ecabf41f"]}

dillon1000/react

Files changed