{"commit":{"revision":"b9ce8bdcfde51a4f7b4f1068e58ba99450efbb47","shortRevision":"b9ce8bdcfd","authorEmail":"gsathya.ceg@gmail.com","authorName":"Sathya Gunasekaran","authoredAt":"2022-10-18T18:57:34+01:00","subject":"[SSA] Fix identifierID hack"},"body":"Rather than starting from 1000, start from the last used identifier id.","files":[{"status":"M","path":"compiler\/forget\/src\/HIR\/BuildHIR.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/HIR.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/HIRBuilder.ts"},{"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-for.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-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-simple.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-single-if.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"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-while.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/hir-test.ts"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex fff2abe47a..9ed27aab02 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -20,7 +20,7 @@ import {\n Terminal,\n ThrowTerminal,\n } from \".\/HIR\";\n-import HIRBuilder from \".\/HIRBuilder\";\n+import HIRBuilder, { Environment } from \".\/HIRBuilder\";\n import todo, { todoInvariant } from \".\/todo\";\n \n \/\/ *******************************************************************************************\n@@ -46,8 +46,11 @@ const GLOBALS: Map = new Map([\n * TODO: consider modeling control-flow at expression level for even more fine-\n * grained reactivity.\n *\/\n-export function lower(func: NodePath): HIRFunction {\n- const builder = new HIRBuilder();\n+export function lower(\n+ func: NodePath,\n+ env: Environment\n+): HIRFunction {\n+ const builder = new HIRBuilder(env);\n \n const id =\n func.isFunctionDeclaration() && func.node.id != null\ndiff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex c09eef78c5..e1c409beb2 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -292,11 +292,3 @@ export function makeScopeId(id: number): ScopeId {\n *\/\n const opaqueIdentifierId = Symbol();\n export type IdentifierId = number & { [opaqueIdentifierId]: \"IdentifierId\" };\n-\n-export function makeIdentifierId(id: number): IdentifierId {\n- invariant(\n- id >= 0 && Number.isInteger(id),\n- \"Expected identifier id to be a non-negative integer\"\n- );\n- return id as IdentifierId;\n-}\ndiff --git a\/compiler\/forget\/src\/HIR\/HIRBuilder.ts b\/compiler\/forget\/src\/HIR\/HIRBuilder.ts\nindex 5f754be897..bb198b5620 100644\n--- a\/compiler\/forget\/src\/HIR\/HIRBuilder.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIRBuilder.ts\n@@ -16,7 +16,6 @@ import {\n IdentifierId,\n Instruction,\n makeBlockId,\n- makeIdentifierId,\n Terminal,\n } from \".\/HIR\";\n \n@@ -56,6 +55,22 @@ function newBlock(id: BlockId): WipBlock {\n return { id, instructions: [] };\n }\n \n+export class Environment {\n+ #nextIdentifer: number = 0;\n+\n+ #makeIdentifierId(id: number): IdentifierId {\n+ invariant(\n+ id >= 0 && Number.isInteger(id),\n+ \"Expected identifier id to be a non-negative integer\"\n+ );\n+ return id as IdentifierId;\n+ }\n+\n+ get nextIdentifierId(): IdentifierId {\n+ return this.#makeIdentifierId(this.#nextIdentifer++);\n+ }\n+}\n+\n \/**\n * Helper class for constructing a CFG\n *\/\n@@ -65,8 +80,16 @@ export default class HIRBuilder {\n #current: WipBlock = newBlock(makeBlockId(0));\n #entry: BlockId = makeBlockId(0);\n #scopes: Array = [];\n- #nextIdentifier: IdentifierId = makeIdentifierId(0);\n #bindings: Map = new Map();\n+ #env: Environment;\n+\n+ get nextIdentifierId() {\n+ return this.#env.nextIdentifierId;\n+ }\n+\n+ constructor(env: Environment) {\n+ this.#env = env;\n+ }\n \n debug(): string {\n return JSON.stringify(\n@@ -88,7 +111,7 @@ export default class HIRBuilder {\n }\n \n makeTemporary(): Identifier {\n- const id = makeIdentifierId(this.#nextIdentifier++);\n+ const id = this.nextIdentifierId;\n return {\n id,\n name: null,\n@@ -98,7 +121,7 @@ export default class HIRBuilder {\n resolveIdentifier(node: t.Identifier): Identifier {\n let identifier = this.#bindings.get(node);\n if (identifier == null) {\n- const id = makeIdentifierId(this.#nextIdentifier++);\n+ const id = this.nextIdentifierId;\n identifier = { id, name: node.name };\n this.#bindings.set(node, identifier);\n }\ndiff --git a\/compiler\/forget\/src\/HIR\/SSAify.ts b\/compiler\/forget\/src\/HIR\/SSAify.ts\nindex 422717389f..bb45a0082c 100644\n--- a\/compiler\/forget\/src\/HIR\/SSAify.ts\n+++ b\/compiler\/forget\/src\/HIR\/SSAify.ts\n@@ -8,10 +8,10 @@ import {\n IdentifierId,\n Instruction,\n InstructionKind,\n- makeIdentifierId,\n Phi,\n Place,\n } from \".\/HIR\";\n+import { Environment } from \".\/HIRBuilder\";\n \n type IncompletePhi = {\n old: Place;\n@@ -29,6 +29,15 @@ class SSABuilder {\n #states: Map = new Map();\n #current: BasicBlock | null = null;\n visitedBlocks: Set = new Set();\n+ #env: Environment;\n+\n+ constructor(env: Environment) {\n+ this.#env = env;\n+ }\n+\n+ get nextIdentifierId() {\n+ return this.#env.nextIdentifierId;\n+ }\n \n \/\/ Hack(gsn): Start from the last stored id in HIRBuilder.\n \/\/ Need to refactor makeTemporary and relevant state out of HIR Builder.\n@@ -47,7 +56,7 @@ class SSABuilder {\n makePlace(oldPlace: Place): Place {\n const identifier = {\n ...oldPlace.identifier,\n- id: makeIdentifierId(this.#id++),\n+ id: this.nextIdentifierId,\n };\n return {\n ...oldPlace,\n@@ -58,7 +67,7 @@ class SSABuilder {\n makePlaceForPhi(oldPlace: Place): Place {\n const identifier = {\n ...oldPlace.identifier,\n- id: makeIdentifierId(this.#id++),\n+ id: this.nextIdentifierId,\n };\n return {\n identifier,\n@@ -173,9 +182,8 @@ class SSABuilder {\n }\n }\n \n-export default function buildSSA(func: HIRFunction) {\n- const builder = new 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)) {\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 85c2fa2feb..e48c6b6314 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,30 +21,30 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Let mutate y$1001 = 2\n- Const mutate $1002 = 2\n- Const mutate $1003 = Binary mutate y$1001 === mutate $1002\n- If (mutate $1003) then:bb2 else:bb1\n+ Let mutate x$7 = 1\n+ Let mutate y$8 = 2\n+ Const mutate $9 = 2\n+ Const mutate $10 = Binary mutate y$8 === mutate $9\n+ If (mutate $10) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$1011 = 3\n+ Reassign mutate x$18 = 3\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- Const mutate y$1005: phi(bb0: mutate y$1001, bb2: mutate y$1001)\n- Const mutate x$1010: phi(bb0: mutate x$1000, bb2: mutate x$1011)\n- Const mutate $1004 = 3\n- Const mutate $1006 = Binary mutate y$1005 === mutate $1004\n- If (mutate $1006) then:bb4 else:bb3\n+ Const mutate y$12: phi(bb0: mutate y$8, bb2: mutate y$8)\n+ Const mutate x$17: phi(bb0: mutate x$7, bb2: mutate x$18)\n+ Const mutate $11 = 3\n+ Const mutate $13 = Binary mutate y$12 === mutate $11\n+ If (mutate $13) then:bb4 else:bb3\n bb4:\n predecessor blocks: bb1\n- Reassign mutate x$1009 = 5\n+ Reassign mutate x$16 = 5\n Goto bb3\n bb3:\n predecessor blocks: bb1 bb4\n- Const mutate x$1007: phi(bb1: mutate x$1010, bb4: mutate x$1009)\n- Reassign mutate y$1008 = mutate x$1007\n+ Const mutate x$14: phi(bb1: mutate x$17, bb4: mutate x$16)\n+ Reassign mutate y$15 = mutate x$14\n Return\n ```\n \n@@ -52,17 +52,17 @@ bb3:\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- let y$1001 = 2;\n- if (y$1001 === 2) {\n- x$1011 = 3;\n+ let x$7 = 1;\n+ let y$8 = 2;\n+ if (y$8 === 2) {\n+ x$18 = 3;\n (\"<>\");\n }\n- if (y$1005 === 3) {\n- x$1009 = 5;\n+ if (y$12 === 3) {\n+ x$16 = 5;\n (\"<>\");\n }\n- y$1008 = x$1007;\n+ y$15 = x$14;\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 23199e29ef..6bbc99b56a 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,19 +18,19 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Let mutate y$1001 = 2\n- Const mutate $1002 = 2\n- Const mutate $1003 = Binary mutate y$1001 === mutate $1002\n- If (mutate $1003) then:bb2 else:bb1\n+ Let mutate x$5 = 1\n+ Let mutate y$6 = 2\n+ Const mutate $7 = 2\n+ Const mutate $8 = Binary mutate y$6 === mutate $7\n+ If (mutate $8) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$1006 = 3\n+ Reassign mutate x$11 = 3\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- Const mutate x$1004: phi(bb0: mutate x$1000, bb2: mutate x$1006)\n- Reassign mutate y$1005 = mutate x$1004\n+ Const mutate x$9: phi(bb0: mutate x$5, bb2: mutate x$11)\n+ Reassign mutate y$10 = mutate x$9\n Return\n ```\n \n@@ -38,13 +38,13 @@ bb1:\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- let y$1001 = 2;\n- if (y$1001 === 2) {\n- x$1006 = 3;\n+ let x$5 = 1;\n+ let y$6 = 2;\n+ if (y$6 === 2) {\n+ x$11 = 3;\n (\"<>\");\n }\n- y$1005 = x$1004;\n+ y$10 = x$9;\n return;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-for.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-for.expect.md\nindex aa2598cd18..cf1efa02b0 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-for.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-for.expect.md\n@@ -16,29 +16,29 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 0\n+ Let mutate x$5 = 0\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb4\n- Const mutate x$1002: phi(bb0: mutate x$1000, bb4: mutate x$1005)\n- Const mutate $1001 = 10\n- Const mutate $1003 = Binary mutate x$1002 < mutate $1001\n- If (mutate $1003) then:bb4 else:bb2\n+ Const mutate x$7: phi(bb0: mutate x$5, bb4: mutate x$10)\n+ Const mutate $6 = 10\n+ Const mutate $8 = Binary mutate x$7 < mutate $6\n+ If (mutate $8) then:bb4 else:bb2\n bb4:\n predecessor blocks: bb1\n- Const mutate $1004 = 1\n- Reassign mutate x$1005 = Binary mutate x$1002 + mutate $1004\n+ Const mutate $9 = 1\n+ Reassign mutate x$10 = Binary mutate x$7 + mutate $9\n Goto bb1\n bb2:\n predecessor blocks: bb1\n- Return mutate x$1002\n+ Return mutate x$7\n ```\n \n ## Code\n \n ```javascript\n function foo$0() {\n- let x$1000 = 0;\n+ let x$5 = 0;\n (\"<>\");\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 d68255620b..f920361821 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@@ -19,16 +19,16 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Let mutate y$1001 = 2\n- If (mutate y$1001) then:bb2 else:bb3\n+ Let mutate x$5 = 1\n+ Let mutate y$6 = 2\n+ If (mutate y$6) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n- Let mutate z$1003 = Binary mutate x$1000 + mutate y$1001\n+ Let mutate z$8 = Binary mutate x$5 + mutate y$6\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Let mutate z$1002 = mutate x$1000\n+ Let mutate z$7 = mutate x$5\n Goto bb1\n bb1:\n predecessor blocks: bb3 bb2\n@@ -39,13 +39,13 @@ bb1:\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- let y$1001 = 2;\n- if (y$1001) {\n- let z$1003 = x$1000 + y$1001;\n+ let x$5 = 1;\n+ let y$6 = 2;\n+ if (y$6) {\n+ let z$8 = x$5 + y$6;\n (\"<>\");\n } else {\n- let z$1002 = x$1000;\n+ let z$7 = x$5;\n (\"<>\");\n }\n return;\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 45cfc3a2e4..ccb178a710 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@@ -17,30 +17,30 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Const mutate $1001 = 1\n- Const mutate $1002 = Binary mutate x$1000 === mutate $1001\n- If (mutate $1002) then:bb2 else:bb1\n+ Let mutate x$4 = 1\n+ Const mutate $5 = 1\n+ Const mutate $6 = Binary mutate x$4 === mutate $5\n+ If (mutate $6) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$1004 = 2\n+ Reassign mutate x$8 = 2\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- Const mutate x$1003: phi(bb0: mutate x$1000, bb2: mutate x$1004)\n- Return mutate x$1003\n+ Const mutate x$7: phi(bb0: mutate x$4, bb2: mutate x$8)\n+ Return mutate x$7\n ```\n \n ## Code\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- if (x$1000 === 1) {\n- x$1004 = 2;\n+ let x$4 = 1;\n+ if (x$4 === 1) {\n+ x$8 = 2;\n (\"<>\");\n }\n- return x$1003;\n+ return x$7;\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 da3a8f9d63..3de7aae32b 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@@ -20,22 +20,22 @@ function foo() {\n \n ```\n bb0:\n- Let mutate y$1000 = 2\n- Const mutate $1001 = 1\n- Const mutate $1002 = Binary mutate y$1000 > mutate $1001\n- If (mutate $1002) then:bb2 else:bb3\n+ Let mutate y$5 = 2\n+ Const mutate $6 = 1\n+ Const mutate $7 = Binary mutate y$5 > mutate $6\n+ If (mutate $7) then:bb2 else:bb3\n bb2:\n predecessor blocks: bb0\n- Reassign mutate y$1006 = 1\n+ Reassign mutate y$11 = 1\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Reassign mutate y$1003 = 2\n+ Reassign mutate y$8 = 2\n Goto bb1\n bb1:\n predecessor blocks: bb3 bb2\n- Const mutate y$1004: phi(bb3: mutate y$1003, bb2: mutate y$1006)\n- Let mutate x$1005 = mutate y$1004\n+ Const mutate y$9: phi(bb3: mutate y$8, bb2: mutate y$11)\n+ Let mutate x$10 = mutate y$9\n Return\n ```\n \n@@ -43,15 +43,15 @@ bb1:\n \n ```javascript\n function foo$0() {\n- let y$1000 = 2;\n- if (y$1000 > 1) {\n- y$1006 = 1;\n+ let y$5 = 2;\n+ if (y$5 > 1) {\n+ y$11 = 1;\n (\"<>\");\n } else {\n- y$1003 = 2;\n+ y$8 = 2;\n (\"<>\");\n }\n- let x$1005 = y$1004;\n+ let x$10 = y$9;\n return;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple.expect.md\nindex 104b2a4f7c..5e57e56d29 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-simple.expect.md\n@@ -13,8 +13,8 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Let mutate y$1001 = 2\n+ Let mutate x$3 = 1\n+ Let mutate y$4 = 2\n Return\n ```\n \n@@ -22,8 +22,8 @@ bb0:\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- let y$1001 = 2;\n+ let x$3 = 1;\n+ let y$4 = 2;\n return;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-single-if.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-single-if.expect.md\nindex 501c07b2d0..aef7fb703d 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-single-if.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-single-if.expect.md\n@@ -17,12 +17,12 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Let mutate y$1001 = 2\n- If (mutate y$1001) then:bb2 else:bb1\n+ Let mutate x$4 = 1\n+ Let mutate y$5 = 2\n+ If (mutate y$5) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Let mutate z$1002 = Binary mutate x$1000 + mutate y$1001\n+ Let mutate z$6 = Binary mutate x$4 + mutate y$5\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n@@ -33,10 +33,10 @@ bb1:\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- let y$1001 = 2;\n- if (y$1001) {\n- let z$1002 = x$1000 + y$1001;\n+ let x$4 = 1;\n+ let y$5 = 2;\n+ if (y$5) {\n+ let z$6 = x$4 + y$5;\n (\"<>\");\n }\n return;\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 5845ad9436..b4c5033f86 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@@ -28,34 +28,34 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Const mutate $1001 = 2\n- Const mutate $1002 = Binary mutate x$1000 === mutate $1001\n- Const mutate $1003 = 1\n- Const mutate $1004 = Binary mutate x$1000 === mutate $1003\n- Switch (mutate x$1000)\n- Case mutate $1004: bb5\n- Case mutate $1002: bb3\n+ Let mutate x$10 = 1\n+ Const mutate $11 = 2\n+ Const mutate $12 = Binary mutate x$10 === mutate $11\n+ Const mutate $13 = 1\n+ Const mutate $14 = Binary mutate x$10 === mutate $13\n+ Switch (mutate x$10)\n+ Case mutate $14: bb5\n+ Case mutate $12: bb3\n Default: bb2\n bb5:\n predecessor blocks: bb0\n- Const mutate $1011 = 1\n- Reassign mutate x$1012 = Binary mutate x$1000 + mutate $1011\n+ Const mutate $21 = 1\n+ Reassign mutate x$22 = Binary mutate x$10 + mutate $21\n Goto bb1\n bb3:\n predecessor blocks: bb0\n- Const mutate $1009 = 2\n- Reassign mutate x$1010 = Binary mutate x$1000 + mutate $1009\n+ Const mutate $19 = 2\n+ Reassign mutate x$20 = Binary mutate x$10 + mutate $19\n Goto bb1\n bb2:\n predecessor blocks: bb0\n- Const mutate $1005 = 3\n- Reassign mutate x$1006 = Binary mutate x$1000 + mutate $1005\n+ Const mutate $15 = 3\n+ Reassign mutate x$16 = Binary mutate x$10 + mutate $15\n Goto bb1\n bb1:\n predecessor blocks: bb5 bb3 bb2\n- Const mutate x$1007: phi(bb5: mutate x$1012, bb3: mutate x$1010, bb2: mutate x$1006)\n- Let mutate y$1008 = mutate x$1007\n+ Const mutate x$17: phi(bb5: mutate x$22, bb3: mutate x$20, bb2: mutate x$16)\n+ Let mutate y$18 = mutate x$17\n Return\n ```\n \n@@ -63,22 +63,22 @@ bb1:\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- switch (x$1000) {\n- case x$1000 === 1: {\n- x$1012 = x$1000 + 1;\n+ let x$10 = 1;\n+ switch (x$10) {\n+ case x$10 === 1: {\n+ x$22 = x$10 + 1;\n (\"<>\");\n }\n- case x$1000 === 2: {\n- x$1010 = x$1000 + 2;\n+ case x$10 === 2: {\n+ x$20 = x$10 + 2;\n (\"<>\");\n }\n default: {\n- x$1006 = x$1000 + 3;\n+ x$16 = x$10 + 3;\n (\"<>\");\n }\n }\n- let y$1008 = x$1007;\n+ let y$18 = x$17;\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 39f079b678..833cf61c93 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@@ -16,30 +16,30 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n- Const mutate $1001 = 1\n- Const mutate $1002 = Binary mutate x$1000 === mutate $1001\n- If (mutate $1002) then:bb2 else:bb1\n+ Let mutate x$4 = 1\n+ Const mutate $5 = 1\n+ Const mutate $6 = Binary mutate x$4 === mutate $5\n+ If (mutate $6) then:bb2 else:bb1\n bb2:\n predecessor blocks: bb0\n- Reassign mutate x$1004 = 2\n+ Reassign mutate x$8 = 2\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb2\n- Const mutate x$1003: phi(bb0: mutate x$1000, bb2: mutate x$1004)\n- Throw mutate x$1003\n+ Const mutate x$7: phi(bb0: mutate x$4, bb2: mutate x$8)\n+ Throw mutate x$7\n ```\n \n ## Code\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n- if (x$1000 === 1) {\n- x$1004 = 2;\n+ let x$4 = 1;\n+ if (x$4 === 1) {\n+ x$8 = 2;\n (\"<>\");\n }\n- throw x$1003;\n+ throw x$7;\n }\n \n ```\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 fe737e26b6..2d1f130bc6 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@@ -17,29 +17,29 @@ function foo() {\n \n ```\n bb0:\n- Let mutate x$1000 = 1\n+ Let mutate x$5 = 1\n Goto bb1\n bb1:\n predecessor blocks: bb0 bb3\n- Const mutate x$1002: phi(bb0: mutate x$1000, bb3: mutate x$1005)\n- Const mutate $1001 = 10\n- Const mutate $1003 = Binary mutate x$1002 < mutate $1001\n- If (mutate $1003) then:bb3 else:bb2\n+ Const mutate x$7: phi(bb0: mutate x$5, bb3: mutate x$10)\n+ Const mutate $6 = 10\n+ Const mutate $8 = Binary mutate x$7 < mutate $6\n+ If (mutate $8) then:bb3 else:bb2\n bb3:\n predecessor blocks: bb1\n- Const mutate $1004 = 1\n- Reassign mutate x$1005 = Binary mutate x$1002 + mutate $1004\n+ Const mutate $9 = 1\n+ Reassign mutate x$10 = Binary mutate x$7 + mutate $9\n Goto bb1\n bb2:\n predecessor blocks: bb1\n- Return mutate x$1002\n+ Return mutate x$7\n ```\n \n ## Code\n \n ```javascript\n function foo$0() {\n- let x$1000 = 1;\n+ let x$5 = 1;\n (\"<>\");\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/hir-test.ts b\/compiler\/forget\/src\/__tests__\/hir-test.ts\nindex 7d7229bca7..4e4b07233a 100644\n--- a\/compiler\/forget\/src\/__tests__\/hir-test.ts\n+++ b\/compiler\/forget\/src\/__tests__\/hir-test.ts\n@@ -17,6 +17,7 @@ import prettier from \"prettier\";\n import { lower } from \"..\/HIR\/BuildHIR\";\n import codegen from \"..\/HIR\/Codegen\";\n import { HIRFunction } from \"..\/HIR\/HIR\";\n+import { Environment } from \"..\/HIR\/HIRBuilder\";\n import inferReferenceEffects from \"..\/HIR\/InferReferenceEffects\";\n import printHIR from \"..\/HIR\/PrintHIR\";\n import buildSSA from \"..\/HIR\/SSAify\";\n@@ -44,10 +45,11 @@ describe(\"React Forget (HIR version)\", () => {\n traverse(ast, {\n FunctionDeclaration: {\n enter(nodePath) {\n- const ir: HIRFunction = lower(nodePath);\n+ const env: Environment = new Environment();\n+ const ir: HIRFunction = lower(nodePath, env);\n inferReferenceEffects(ir);\n if (file.startsWith(\"ssa\")) {\n- buildSSA(ir);\n+ buildSSA(ir, env);\n }\n \/\/ const lifetimeGraph = buildDefUseGraph(ir);\n const textHIR = printHIR(ir.body);\n","parents":["379251c65f39039ace1d2e5a80bdb5938cf3427c"]}

dillon1000/react

Files changed