diff --git a/compiler/forget/src/HIR/HIR.ts b/compiler/forget/src/HIR/HIR.ts index eab9a26334..3b10a356c6 100644 --- a/compiler/forget/src/HIR/HIR.ts +++ b/compiler/forget/src/HIR/HIR.ts @@ -63,7 +63,6 @@ export type HIRFunction = { body: HIR; generator: boolean; async: boolean; - extra?: string; }; /** diff --git a/compiler/forget/src/HIR/InferReactiveScopeDependencies.ts b/compiler/forget/src/HIR/InferReactiveScopeDependencies.ts index 1b6e473732..c785bfb60f 100644 --- a/compiler/forget/src/HIR/InferReactiveScopeDependencies.ts +++ b/compiler/forget/src/HIR/InferReactiveScopeDependencies.ts @@ -18,7 +18,6 @@ import { ReactiveScope, } from "./HIR"; import { BlockTerminal, Visitor, visitTree } from "./HIRTreeVisitor"; -import { printPlace } from "./PrintHIR"; import { eachInstructionValueOperand } from "./visitors"; export function inferReactiveScopeDependencies(fn: HIRFunction) { @@ -26,23 +25,12 @@ export function inferReactiveScopeDependencies(fn: HIRFunction) { // that only visits and replacing this usage const visitor = new ScopeDependenciesVisitor(fn); visitTree(fn, visitor); - - const output = []; - for (const scope of visitor.allScopes) { - if (scope.dependencies.size > 0) { - output.push( - `scope${scope.id} [${scope.range.start}:${ - scope.range.end - }]:\n${Array.from(scope.dependencies) - .map((p) => " - " + printPlace(p)) - .join("\n")}` - ); - } - } - fn.extra = output.join("\n"); } -function instructionInScope(instrId: InstructionId, scope: ReactiveScope) { +export function instructionInScope( + instrId: InstructionId, + scope: ReactiveScope +) { return instrId >= scope.range.start && instrId < scope.range.end; } @@ -52,8 +40,6 @@ class ScopeDependenciesVisitor #identifiers: Map = new Map(); // Scopes that are currently active at this point in the traversal #activeScopes: Set = new Set(); - // All scopes encountered during the traversal - allScopes: Set = new Set(); get #lastActiveScope(): ReactiveScope | null { const scopes = [...this.#activeScopes]; @@ -71,7 +57,6 @@ class ScopeDependenciesVisitor #recordActiveScope(scope: ReactiveScope) { this.#activeScopes.add(scope); - this.allScopes.add(scope); } /** diff --git a/compiler/forget/src/HIR/PrintHIR.ts b/compiler/forget/src/HIR/PrintHIR.ts index d9cf0b32ef..2063885c9b 100644 --- a/compiler/forget/src/HIR/PrintHIR.ts +++ b/compiler/forget/src/HIR/PrintHIR.ts @@ -24,6 +24,7 @@ import { Terminal, } from "./HIR"; import { buildAliasSets } from "./InferAlias"; +import { eachReactiveScope } from "./visitors"; export type Options = { indent: number; @@ -32,9 +33,7 @@ export type Options = { export function printFunction(fn: HIRFunction): string { const output = []; output.push(printHIR(fn.body)); - if (fn.extra !== undefined) { - output.push(fn.extra); - } + output.push(printReactiveScopes(fn.body)); return output.join("\n"); } @@ -345,3 +344,25 @@ export function printAliases(aliases: DisjointSet): string { return items.join("\n"); } + +export function printReactiveScopes(ir: HIR) { + const output = []; + for (const scope of eachReactiveScope(ir)) { + let shouldOutput = false; + const line = [ + `scope${scope.id} [${scope.range.start}:${scope.range.end}]:`, + ]; + if (scope.dependencies.size > 0) { + shouldOutput = true; + line.push( + `${Array.from(scope.dependencies) + .map((p) => " - dependency: " + printPlace(p)) + .join("\n")}` + ); + } + if (shouldOutput) { + output.push(line.join("\n")); + } + } + return output.join("\n"); +} diff --git a/compiler/forget/src/HIR/visitors.ts b/compiler/forget/src/HIR/visitors.ts index e65c27a323..9df714df84 100644 --- a/compiler/forget/src/HIR/visitors.ts +++ b/compiler/forget/src/HIR/visitors.ts @@ -9,10 +9,13 @@ import { assertExhaustive } from "../Common/utils"; import { BasicBlock, BlockId, + HIR, Instruction, InstructionValue, makeInstructionId, Place, + ReactiveScope, + ScopeId, Terminal, } from "./HIR"; @@ -375,3 +378,19 @@ export function* eachBlockOperand(block: BasicBlock): Iterable { } yield* eachTerminalOperand(block.terminal); } + +export function* eachReactiveScope(ir: HIR): Iterable { + const seenScopes: Set = new Set(); + for (const [, block] of ir.blocks) { + for (const operand of eachBlockOperand(block)) { + const scope = operand.identifier.scope; + if (scope != null) { + if (seenScopes.has(scope.id)) { + continue; + } + seenScopes.add(scope.id); + yield scope; + } + } + } +} diff --git a/compiler/forget/src/__tests__/fixtures/hir/_bug_expression-with-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/hir/_bug_expression-with-assignment.expect.md index 6968aebf9f..75414ab485 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/_bug_expression-with-assignment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/_bug_expression-with-assignment.expect.md @@ -21,11 +21,11 @@ bb0: [4] Const mutate $7_@3 = Binary read $6_@2 + read x$5_@1 [5] Return read $7_@3 scope2 [3:4]: - - read x$5_@1 - - read x$5_@1 + - dependency: read x$5_@1 + - dependency: read x$5_@1 scope3 [4:5]: - - read $6_@2 - - read x$5_@1 + - dependency: read $6_@2 + - dependency: read x$5_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/_bug_inverted-if-else.expect.md b/compiler/forget/src/__tests__/fixtures/hir/_bug_inverted-if-else.expect.md index 9a6334a713..5bc24db254 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/_bug_inverted-if-else.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/_bug_inverted-if-else.expect.md @@ -34,9 +34,9 @@ bb1: predecessor blocks: bb3 bb2 [7] Return read x$11 scope1 [3:4]: - - read b$6 + - dependency: read b$6 scope2 [5:6]: - - read c$7 + - dependency: read c$7 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md b/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md index 7dfa8c02dd..d19420aa34 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md @@ -29,14 +29,14 @@ bb0: [7] Const mutate x$11_@6 = Binary read x$9_@4 >>> read $10_@5 [8] Return scope2 [3:4]: - - read x$5_@0 - - read $6_@1 + - dependency: read x$5_@0 + - dependency: read $6_@1 scope4 [5:6]: - - read x$7_@2 - - read $8_@3 + - dependency: read x$7_@2 + - dependency: read $8_@3 scope6 [7:8]: - - read x$9_@4 - - read $10_@5 + - dependency: read x$9_@4 + - dependency: read $10_@5 ``` ### CFG @@ -82,7 +82,7 @@ bb0: [4] Reassign mutate a$4_@1.b.c[0:5] = Binary read a$4_@1.b.c * read $6_@2 [5] Return scope2 [3:4]: - - mutate a$4_@1.b.c + - dependency: mutate a$4_@1.b.c ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/call.expect.md b/compiler/forget/src/__tests__/fixtures/hir/call.expect.md index aa50a5f7a8..5cabd7f171 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/call.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/call.expect.md @@ -56,11 +56,11 @@ bb0: [8] Const mutate $15_@4 = JSX [9] Return read $15_@4 scope2 [5:6]: - - read $12_@1 + - dependency: read $12_@1 scope4 [8:9]: - - read $14_@3 - - read a$10_@0 - - freeze b$11_@0 + - dependency: read $14_@3 + - dependency: read a$10_@0 + - dependency: freeze b$11_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/component.expect.md b/compiler/forget/src/__tests__/fixtures/hir/component.expect.md index f1a704f665..ef4299261b 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/component.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/component.expect.md @@ -89,9 +89,9 @@ bb2: [33] Const mutate $60_@18 = JSX {read $54_@12}{read $57_@15}{read $58_@16}{freeze renderedItems$29_@2}{read $59_@17} [34] Return read $60_@18 scope0 [1:2]: - - read props$26.items + - dependency: read props$26.items scope1 [2:3]: - - read props$26.maxItems + - dependency: read props$26.maxItems ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md b/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md index bf49d3078d..7efd9c60bf 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md @@ -90,9 +90,9 @@ bb1: [6] Call mutate a_DEBUG$5_@0.push(read props$4.d) [7] Return freeze a_DEBUG$5_@0 scope0 [1:7]: - - read props$4.a - - read props$4.b - - read props$4.d + - dependency: read props$4.a + - dependency: read props$4.b + - dependency: read props$4.d ``` ### CFG @@ -157,10 +157,10 @@ bb1: [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0 scope0 [1:7]: - - read props$3.a - - read props$3.c - - read props$3.b - - read props$3.d + - dependency: read props$3.a + - dependency: read props$3.c + - dependency: read props$3.b + - dependency: read props$3.d ``` ### CFG @@ -227,10 +227,10 @@ bb1: [7] Call mutate a$5_@0.push(read props$4.d) [8] Return freeze a$5_@0 scope0 [1:8]: - - read props$4.a - - read props$4.c - - read props$4.b - - read props$4.d + - dependency: read props$4.a + - dependency: read props$4.c + - dependency: read props$4.b + - dependency: read props$4.d ``` ### CFG @@ -297,10 +297,10 @@ bb1: [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0 scope0 [1:7]: - - read props$3.a - - read props$3.c - - read props$3.b - - read props$3.d + - dependency: read props$3.a + - dependency: read props$3.c + - dependency: read props$3.b + - dependency: read props$3.d ``` ### CFG @@ -366,9 +366,9 @@ bb1: [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0 scope0 [1:7]: - - read props$3.a - - read props$3.d - - read props$3.c + - dependency: read props$3.a + - dependency: read props$3.d + - dependency: read props$3.c ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.expect.md b/compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.expect.md index b61fd849fd..f7ec1e0374 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.expect.md @@ -53,13 +53,9 @@ bb3: predecessor blocks: bb4 bb1 [9] Const mutate $16_@2 = JSX [10] Return read $16_@2 -scope0 [1:9]: - - read props$6.p0 - - read props$6.p2 - - read props$6.p1 scope2 [9:10]: - - freeze a$7_@0 - - freeze b$8_@0 + - dependency: freeze a$7_@0 + - dependency: freeze b$8_@0 ``` ### CFG @@ -148,8 +144,8 @@ bb3: [10] Const mutate $19_@2 = JSX [11] Return read $19_@2 scope2 [10:11]: - - freeze a$9_@0 - - freeze b$10_@0 + - dependency: freeze a$9_@0 + - dependency: freeze b$10_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md b/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md index 06aee4b185..cc460a0f84 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md @@ -56,11 +56,11 @@ bb0: [8] Const mutate $15_@4 = JSX [9] Return read $15_@4 scope2 [5:6]: - - read $12_@1 + - dependency: read $12_@1 scope4 [8:9]: - - read $14_@3 - - read a$10_@0 - - freeze b$11_@0 + - dependency: read $14_@3 + - dependency: read a$10_@0 + - dependency: freeze b$11_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md b/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md index 5199b4ef6e..335172be9e 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md @@ -43,14 +43,14 @@ bb3: predecessor blocks: bb4 bb1 [12] Return scope0 [1:3]: - - read a$6 + - dependency: read a$6 scope1 [3:4]: - - freeze x$8_@0 + - dependency: freeze x$8_@0 scope2 [5:12]: - - read x$8_@0 - - read x$8_@0.length - - read b$7 - - read b$7 + - dependency: read x$8_@0 + - dependency: read x$8_@0.length + - dependency: read b$7 + - dependency: read b$7 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md b/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md index 1fc0a646bb..b71339dc8e 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md @@ -43,13 +43,13 @@ bb3: predecessor blocks: bb4 bb1 [10] Return freeze items2$10_@1 scope0 [1:10]: - - read z$8 - - read x$6 - - read x$6 - - read y$7 + - dependency: read z$8 + - dependency: read x$6 + - dependency: read x$6 + - dependency: read y$7 scope1 [3:7]: - - read y$7 - - read x$6 + - dependency: read y$7 + - dependency: read x$6 ``` ### CFG diff --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 index 81d880bcdc..eaa18210ec 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/extend-scopes-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/extend-scopes-if.expect.md @@ -47,9 +47,9 @@ bb7: [10] Const mutate $13_@2 = null [11] Return read $13_@2 scope0 [1:8]: - - read c$9 - - read b$8 - - read a$7 + - dependency: read c$9 + - dependency: read b$8 + - dependency: read a$7 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.expect.md b/compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.expect.md index 7ceeea4df1..3c577ec1e5 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.expect.md @@ -24,8 +24,8 @@ bb0: [4] Call mutate foo$4_@2(read b$6_@1) [5] Return scope1 [2:3]: - - read a$5_@0 - - freeze a$5_@0 + - dependency: read a$5_@0 + - dependency: freeze a$5_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md b/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md index a5151d72ed..d3a174c0f3 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md @@ -86,14 +86,14 @@ bb0: [7] Const mutate $16_@6 = JSX {read $13_@3}{read x$11_@0}{read $14_@4}{read y$12_@1}{read $15_@5} [8] Return read $16_@6 scope1 [2:3]: - - freeze x$11_@0 + - dependency: freeze x$11_@0 scope6 [7:8]: - - read Component$0 - - read $13_@3 - - read x$11_@0 - - read $14_@4 - - read y$12_@1 - - read $15_@5 + - dependency: read Component$0 + - dependency: read $13_@3 + - dependency: read x$11_@0 + - dependency: read $14_@4 + - dependency: read y$12_@1 + - dependency: read $15_@5 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.expect.md b/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.expect.md index 9cd53a4082..c96da2c1eb 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.expect.md @@ -46,12 +46,12 @@ bb1: [11] Call mutate call$6_@4(read a$11_@3) [12] Return read a$11_@3 scope0 [1:2]: - - read props$7.cond + - dependency: read props$7.cond scope1 [2:3]: - - read props$7.x + - dependency: read props$7.x scope3 [4:9]: - - read x$9_@1 - - read cond$8_@0 + - dependency: read x$9_@1 + - dependency: read cond$8_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent-across-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/independent-across-if.expect.md index 1da79760d0..429c39885d 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/independent-across-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/independent-across-if.expect.md @@ -158,8 +158,8 @@ bb1: [7] Const mutate $14_@1 = JSX [8] Return read $14_@1 scope1 [7:8]: - - freeze a$9_@0 - - freeze b$10_@0 + - dependency: freeze a$9_@0 + - dependency: freeze b$10_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md b/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md index e2de083090..dea0007418 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md @@ -33,8 +33,8 @@ bb0: [3] Const mutate $10_@1 = JSX [4] Return read $10_@1 scope1 [3:4]: - - freeze a$8_@0 - - freeze b$9_@0 + - dependency: freeze a$8_@0 + - dependency: freeze b$9_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.expect.md index 45773e510c..2c48298942 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.expect.md @@ -124,8 +124,8 @@ bb1: [6] Const mutate $14_@1 = JSX [7] Return read $14_@1 scope1 [6:7]: - - freeze a$9_@0 - - freeze b$10_@0 + - dependency: freeze a$9_@0 + - dependency: freeze b$10_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md b/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md index 065a9d8099..f1c7a9b8f0 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md @@ -34,8 +34,8 @@ bb0: [4] Const mutate $11_@1 = JSX [5] Return read $11_@1 scope1 [4:5]: - - freeze a$9_@0 - - freeze b$10_@0 + - dependency: freeze a$9_@0 + - dependency: freeze b$10_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md index 3d5661bc78..f3f702bb89 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md @@ -31,9 +31,9 @@ bb1: predecessor blocks: bb5 bb3 bb0 [6] Return scope0 [1:6]: - - read c$7 - - read b$6 - - read a$5 + - dependency: read c$7 + - dependency: read b$6 + - dependency: read a$5 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md b/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md index 72fd2a98b7..5cdb48396d 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md @@ -21,9 +21,9 @@ bb0: [4] Const mutate b$9_@2 = read a$8_@1 [5] Return scope1 [3:4]: - - read x$7_@0 + - dependency: read x$7_@0 scope2 [4:5]: - - read a$8_@1 + - dependency: read a$8_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md b/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md index d98c2ec93b..e41629f5ec 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md @@ -32,19 +32,19 @@ bb0: [11] Const mutate $24_@10 = JsxFragment [read $14_@0, read props$13.greeting, read $15_@1, read $16_@2, read $22_@8, read $23_@9] [12] Return read $24_@10 scope6 [7:8]: - - read $19_@5 + - dependency: read $19_@5 scope8 [9:10]: - - read $17_@3 - - read $18_@4 - - read $20_@6 - - read $21_@7 + - dependency: read $17_@3 + - dependency: read $18_@4 + - dependency: read $20_@6 + - dependency: read $21_@7 scope10 [11:12]: - - read $14_@0 - - read props$13.greeting - - read $15_@1 - - read $16_@2 - - read $22_@8 - - read $23_@9 + - dependency: read $14_@0 + - dependency: read props$13.greeting + - dependency: read $15_@1 + - dependency: read $16_@2 + - dependency: read $22_@8 + - dependency: read $23_@9 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md b/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md index 75d1bfb61b..1b90ba1c89 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md @@ -178,8 +178,8 @@ bb1: predecessor blocks: bb2 bb3 [9] Return freeze $12_@3 scope2 [3:4]: - - read $9_@0 - - read $10_@1 + - dependency: read $9_@0 + - dependency: read $10_@1 ``` ### CFG diff --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 index f78fcdc0a9..5136162579 100644 --- 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 @@ -27,9 +27,7 @@ bb1: [4] Call mutate y$10_@0.push(read a$6) [5] Call mutate x$9_@0.push(read b$7) [6] Return -scope0 [1:6]: - - read a$6 - - read b$7 + ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.expect.md b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.expect.md index 515a3143ff..bbf1a8064b 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.expect.md @@ -20,9 +20,7 @@ bb0: [3] Call mutate x$7_@0.push(read a$5) [4] Call mutate y$8_@0.push(read b$6) [5] Return -scope0 [1:5]: - - read a$5 - - read b$6 + ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.expect.md b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.expect.md index d62b0ae459..ccce815fc6 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.expect.md @@ -21,8 +21,8 @@ bb0: [4] Call mutate x$7_@0.push(read a$5) [5] Return scope1 [2:4]: - - read b$6 - - read a$5 + - dependency: read b$6 + - dependency: read a$5 ``` ### CFG diff --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 index 424d34233d..f032fdf3b6 100644 --- 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 @@ -41,13 +41,13 @@ bb1: predecessor blocks: bb3 bb0 [11] Return freeze x$11_@0 scope0 [1:11]: - - read a$8 + - dependency: read a$8 scope1 [3:7]: - - read c$10 - - read b$9 + - dependency: read c$10 + - dependency: read b$9 scope3 [8:9]: - - read $13_@2 - - freeze y$12_@1 + - dependency: read $13_@2 + - dependency: freeze y$12_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.expect.md b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.expect.md index 55f85d983e..c74a032cca 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.expect.md @@ -31,10 +31,7 @@ bb3: bb2: predecessor blocks: bb1 [8] Return -scope0 [1:8]: - - read b$7 - - read a$6 - - read c$8 + ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.expect.md b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.expect.md index e471dd7995..23198cd527 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.expect.md @@ -39,9 +39,9 @@ bb1: predecessor blocks: bb3 bb0 [9] Return freeze x$9_@0 scope0 [1:9]: - - read c$8 - - read b$7 - - read a$6 + - dependency: read c$8 + - dependency: read b$7 + - dependency: read a$6 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md index f410249c7e..2fc05fdcf0 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md @@ -25,12 +25,12 @@ bb0: [6] Const mutate $10_@1 = JSX {read child$9_@0} [7] Return read $10_@1 scope0 [1:6]: - - read Component$0 - - read props$6.p0 + - dependency: read Component$0 + - dependency: read props$6.p0 scope1 [6:7]: - - read Component$0 - - freeze x$7_@0 - - read child$9_@0 + - dependency: read Component$0 + - dependency: freeze x$7_@0 + - dependency: read child$9_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.expect.md index 9173a7c6fa..acd1cf952b 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.expect.md @@ -25,7 +25,7 @@ bb0: [5] Reassign mutate x$4_@0.y[1:6] = read y$5_@1 [6] Return freeze x$4_@0 scope1 [2:5]: - - mutate x$4_@0.y + - dependency: mutate x$4_@0.y ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md index aa6d913ec8..5b43a6ee47 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md @@ -36,14 +36,14 @@ bb1: [9] Const mutate $15_@4 = JSX {freeze x$10_@0} [10] Return read $15_@4 scope0 [1:8]: - - read b$9 - - read b$9 + - dependency: read b$9 + - dependency: read b$9 scope2 [3:4]: - - read a$8.length - - read $11_@1 + - dependency: read a$8.length + - dependency: read $11_@1 scope4 [9:10]: - - read $13_@3 - - freeze x$10_@0 + - dependency: read $13_@3 + - dependency: freeze x$10_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md index 8138b36630..0f8e1e816c 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md @@ -38,17 +38,17 @@ bb1: [9] Const mutate $15_@2 = JSX [10] Return read $15_@2 scope0 [1:7]: - - read props$6.p0 - - read props$6.p1 + - dependency: read props$6.p0 + - dependency: read props$6.p1 scope1 [7:8]: - - read Component$0 - - freeze x$7_@0 - - read y$8_@0.push - - read props$6.p2 + - dependency: read Component$0 + - dependency: freeze x$7_@0 + - dependency: read y$8_@0.push + - dependency: read props$6.p2 scope2 [9:10]: - - read Component$0 - - read x$7_@0 - - read y$8_@0 + - dependency: read Component$0 + - dependency: read x$7_@0 + - dependency: read y$8_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.expect.md index cf5079a158..0960f0c3bb 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.expect.md @@ -69,22 +69,22 @@ bb3: [19] Const mutate $31_@9 = JSX {read $26_@6}{read y$19_@2}{read $27_@7}{freeze x$22_@4}{read $28_@8} [20] Return read $31_@9 scope0 [1:5]: - - read a$13 - - read a$13 + - dependency: read a$13 + - dependency: read a$13 scope2 [6:7]: - - read $17_@1 - - freeze x$16_@0 + - dependency: read $17_@1 + - dependency: freeze x$16_@0 scope4 [8:15]: - - read c$15 - - read b$14 - - read b$14 + - dependency: read c$15 + - dependency: read b$14 + - dependency: read b$14 scope9 [19:20]: - - read $25_@5 - - read $26_@6 - - read y$19_@2 - - read $27_@7 - - freeze x$22_@4 - - read $28_@8 + - dependency: read $25_@5 + - dependency: read $26_@6 + - dependency: read y$19_@2 + - dependency: read $27_@7 + - dependency: freeze x$22_@4 + - dependency: read $28_@8 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md index 2f627e55ef..b0db57ff2f 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md @@ -30,15 +30,15 @@ bb0: [7] Const mutate $11_@3 = JSX [8] Return read $11_@3 scope0 [1:7]: - - read props$6.p0 + - dependency: read props$6.p0 scope2 [5:6]: - - read Component$0 - - freeze x$9_@1 - - read props$6.p1 + - dependency: read Component$0 + - dependency: freeze x$9_@1 + - dependency: read props$6.p1 scope3 [7:8]: - - read Component$0 - - read x$9_@1 - - freeze y$8_@0 + - dependency: read Component$0 + - dependency: read x$9_@1 + - dependency: freeze y$8_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md index 23006a17e7..7ab74156a9 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md @@ -78,14 +78,14 @@ bb1: [18] read x$11_@1 [19] Return scope1 [2:18]: - - read props$6.v2 - - read props$6.v1 - - read props$6.v0 - - read props$6.test - - read props$6.b - - read props$6.c - - read props$6.cond2 - - read props$6.cond + - dependency: read props$6.v2 + - dependency: read props$6.v1 + - dependency: read props$6.v0 + - dependency: read props$6.test + - dependency: read props$6.b + - dependency: read props$6.c + - dependency: read props$6.cond2 + - dependency: read props$6.cond ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md b/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md index 3d6174d171..98fc77e99a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md @@ -28,14 +28,14 @@ bb1: [7] Const mutate $14_@4 = Array [read $13_@3] [8] Return freeze $14_@4 scope1 [3:4]: - - read foo$0 - - read $10_@0 - - read y$9 + - dependency: read foo$0 + - dependency: read $10_@0 + - dependency: read y$9 scope3 [6:7]: - - read y$9 - - read $12_@2 + - dependency: read y$9 + - dependency: read $12_@2 scope4 [7:8]: - - read $13_@3 + - dependency: read $13_@3 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md index 899cbf7728..500ad90a38 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md @@ -20,8 +20,8 @@ bb0: [3] Const mutate x$8_@2 = Array [read a$6_@0, read b$7_@1] [4] Return freeze x$8_@2 scope2 [3:4]: - - read a$6_@0 - - read b$7_@1 + - dependency: read a$6_@0 + - dependency: read b$7_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.expect.md index 3b4a9eda96..ab34c709f7 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.expect.md @@ -66,11 +66,11 @@ bb1: [11] Const mutate $20_@4 = JSX [12] Return read $20_@4 scope2 [7:8]: - - read $14_@1 + - dependency: read $14_@1 scope4 [11:12]: - - read $19_@3 - - freeze a$11_@0 - - freeze b$12_@0 + - dependency: read $19_@3 + - dependency: freeze a$11_@0 + - dependency: freeze b$12_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.expect.md index 9052a9ed43..2b0fc4a432 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.expect.md @@ -56,11 +56,11 @@ bb0: [8] Const mutate $15_@4 = JSX [9] Return read $15_@4 scope2 [5:6]: - - read $12_@1 + - dependency: read $12_@1 scope4 [8:9]: - - read $14_@3 - - read a$10_@0 - - freeze b$11_@0 + - dependency: read $14_@3 + - dependency: read a$10_@0 + - dependency: freeze b$11_@0 ``` ### CFG diff --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 index 618d0a3fd6..c1cd70c44d 100644 --- 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 @@ -44,13 +44,13 @@ bb3: [13] Const mutate y$18_@6 = read x$7_@0 [14] Return scope3 [4:5]: - - read y$8_@1 - - read $9_@2 + - dependency: read y$8_@1 + - dependency: read $9_@2 scope5 [9:10]: - - read y$8_@1 - - read $12_@4 + - dependency: read y$8_@1 + - dependency: read $12_@4 scope6 [13:14]: - - read x$7_@0 + - dependency: read x$7_@0 ``` ### CFG diff --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 index 6c52423540..2b906a0992 100644 --- 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 @@ -32,10 +32,10 @@ bb1: [8] Const mutate y$11_@4 = read x$5_@0 [9] Return scope3 [4:5]: - - read y$6_@1 - - read $7_@2 + - dependency: read y$6_@1 + - dependency: read $7_@2 scope4 [8:9]: - - read x$5_@0 + - dependency: read x$5_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md index bdc078f059..081464c148 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md @@ -40,7 +40,7 @@ bb2: predecessor blocks: bb1 [13] Return read x$7_@0 scope3 [6:8]: - - read $9_@2 + - dependency: read $9_@2 ``` ### CFG diff --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 index fa34e500b8..45ed0f01a9 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-if-else.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-if-else.expect.md @@ -34,10 +34,10 @@ bb1: predecessor blocks: bb2 bb3 [8] Return scope2 [4:5]: - - read x$5_@0 - - read y$6_@1 + - dependency: read x$5_@0 + - dependency: read y$6_@1 scope3 [6:7]: - - read x$5_@0 + - dependency: read x$5_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.expect.md index f834e51a43..c0bbfa338b 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.expect.md @@ -69,11 +69,11 @@ bb1: [20] read x$18_@2 [21] Return scope2 [3:20]: - - read a$9 - - read b$10 - - read c$11 - - read d$12 - - read $14_@1 + - dependency: read a$9 + - dependency: read b$10 + - dependency: read c$11 + - dependency: read d$12 + - dependency: read $14_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.expect.md index f7f1e79e03..f63447d11e 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.expect.md @@ -53,7 +53,7 @@ bb2: predecessor blocks: bb1 [13] Return read x$9_@0 scope1 [8:9]: - - read x$9_@0 + - dependency: read x$9_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.expect.md index 3d00090cd2..6ad92a1b1e 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.expect.md @@ -35,10 +35,10 @@ bb1: predecessor blocks: bb3 bb0 [8] Return scope0 [1:8]: - - read a$5 - - read c$7 - - read c$7 - - read b$6 + - dependency: read a$5 + - dependency: read c$7 + - dependency: read c$7 + - dependency: read b$6 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.expect.md index 1845d20cfc..23fd9620f9 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.expect.md @@ -37,10 +37,10 @@ bb1: predecessor blocks: bb2 bb5 bb3 [8] Return read x$12_@0 scope0 [1:8]: - - read b$8 - - read d$10 - - read c$9 - - read a$7 + - dependency: read b$8 + - dependency: read d$10 + - dependency: read c$9 + - dependency: read a$7 ``` ### CFG diff --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 index 85b5e3dd7d..a608db38bc 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression-phi.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression-phi.expect.md @@ -40,8 +40,8 @@ bb1: [10] Const mutate t$14_@3 = Object { x: read x$6_@0, y: read y$7_@0 } [11] Return freeze t$14_@3 scope3 [10:11]: - - read x$6_@0 - - read y$7_@0 + - dependency: read x$6_@0 + - dependency: read y$7_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md index 4bc5e82a50..dc0a3999aa 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md @@ -20,8 +20,8 @@ bb0: [3] Const mutate x$8_@2 = Object { a: read a$6_@0, b: read b$7_@1 } [4] Return freeze x$8_@2 scope2 [3:4]: - - read a$6_@0 - - read b$7_@1 + - dependency: read a$6_@0 + - dependency: read b$7_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.expect.md index 4e1602d91d..34e6e0bd2c 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.expect.md @@ -36,11 +36,11 @@ bb1: predecessor blocks: bb2 bb3 [9] Return freeze x$6_@0 scope0 [1:9]: - - read a$5 + - dependency: read a$5 scope1 [3:4]: - - mutate x$6_@0.y + - dependency: mutate x$6_@0.y scope2 [6:7]: - - mutate x$6_@0.z + - dependency: mutate x$6_@0.z ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.expect.md index 260f00877c..90b79932c8 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.expect.md @@ -38,7 +38,7 @@ bb1: predecessor blocks: bb2 bb3 [10] Return freeze x$7_@0 scope1 [7:8]: - - mutate x$7_@0.z + - dependency: mutate x$7_@0.z ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.expect.md index 342e1cbe70..49adb48798 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.expect.md @@ -21,7 +21,7 @@ bb0: [4] Call mutate y$5_@1.x.push(mutate $6_@1) [5] Return freeze y$5_@1 scope1 [2:5]: - - read x$4_@0 + - dependency: read x$4_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md index 34f96ef936..d517e2a897 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md @@ -20,7 +20,7 @@ bb0: [3] Reassign mutate y$4_@1.x[2:4] = read x$3_@0 [4] Return freeze y$4_@1 scope1 [2:4]: - - read x$3_@0 + - dependency: read x$3_@0 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md index e579726fd4..997c7f3e6d 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md @@ -22,11 +22,11 @@ bb0: [4] Const mutate x$11_@3 = read c$7 [5] Return read x$11_@3 scope1 [2:3]: - - read a$5 + - dependency: read a$5 scope2 [3:4]: - - read b$6 + - dependency: read b$6 scope3 [4:5]: - - read c$7 + - dependency: read c$7 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.expect.md index c3e955e5a2..ef66c17ae3 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.expect.md @@ -69,13 +69,13 @@ bb1: predecessor blocks: bb3 bb7 [20] Return scope3 [5:10]: - - read a$9 - - read b$10 - - read $15_@2 + - dependency: read a$9 + - dependency: read b$10 + - dependency: read $15_@2 scope5 [13:18]: - - read c$11 - - read d$12 - - read $19_@4 + - dependency: read c$11 + - dependency: read d$12 + - dependency: read $19_@4 ``` ### CFG diff --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 index 157a49d60d..7ec607f293 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple-phi.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-simple-phi.expect.md @@ -38,12 +38,12 @@ bb1: [9] Const mutate x$11_@4 = read y$8_@3 [10] Return scope2 [3:4]: - - read y$5_@0 - - read $6_@1 + - dependency: read y$5_@0 + - dependency: read $6_@1 scope3 [4:9]: - - read $7_@2 + - dependency: read $7_@2 scope4 [9:10]: - - read y$8_@3 + - dependency: read y$8_@3 ``` ### CFG diff --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 index 9c90603e4c..00e490f435 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-single-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-single-if.expect.md @@ -28,8 +28,8 @@ bb1: predecessor blocks: bb2 bb0 [6] Return scope2 [4:5]: - - read x$4_@0 - - read y$5_@1 + - dependency: read x$4_@0 + - dependency: read y$5_@1 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md index 64bac403d1..0477776811 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md @@ -59,21 +59,21 @@ bb1: [16] Const mutate y$22_@9 = read x$16_@5 [17] Return scope2 [3:4]: - - read x$10_@0 - - read $11_@1 + - dependency: read x$10_@0 + - dependency: read $11_@1 scope4 [5:6]: - - read x$10_@0 - - read $13_@3 + - dependency: read x$10_@0 + - dependency: read $13_@3 scope5 [6:16]: - - read x$10_@0 -scope8 [13:14]: - - read x$10_@0 -scope7 [10:11]: - - read x$10_@0 + - dependency: read x$10_@0 scope6 [7:8]: - - read x$10_@0 + - dependency: read x$10_@0 +scope7 [10:11]: + - dependency: read x$10_@0 +scope8 [13:14]: + - dependency: read x$10_@0 scope9 [16:17]: - - read x$16_@5 + - dependency: read x$16_@5 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.expect.md index e6ef3781b6..088e4e6766 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.expect.md @@ -33,10 +33,10 @@ bb2: predecessor blocks: bb1 [9] Return read x$5_@0 scope2 [4:6]: - - read x$5_@0 - - read $6_@1 + - dependency: read x$5_@0 + - dependency: read $6_@1 scope3 [6:7]: - - read x$5_@0 + - dependency: read x$5_@0 ``` ### CFG diff --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 index b8ae586733..5c98e702b0 100644 --- 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 @@ -58,18 +58,15 @@ bb1: [13] Call read y$11_@1.push(read props$9.p4) [14] Const mutate $22_@6 = JSX {read child$19_@5} [15] Return read $22_@6 -scope1 [1:12]: - - read props$9.p2 - - read props$9.p0 scope5 [12:13]: - - read Component$0 - - freeze x$10_@1 - - read y$11_@1.push - - read props$9.p4 + - dependency: read Component$0 + - dependency: freeze x$10_@1 + - dependency: read y$11_@1.push + - dependency: read props$9.p4 scope6 [14:15]: - - read Component$0 - - freeze y$11_@1 - - read child$19_@5 + - dependency: read Component$0 + - dependency: freeze y$11_@1 + - dependency: read child$19_@5 ``` ### CFG diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md b/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md index 82055ff408..ef207bf344 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md @@ -53,19 +53,15 @@ bb1: [13] Call read y$10_@1.push(read props$8.p4) [14] Const mutate $23_@6 = JSX {read child$19_@5} [15] Return read $23_@6 -scope1 [1:12]: - - read props$8.p2 - - read props$8.p3 - - read props$8.p0 scope5 [12:13]: - - read Component$0 - - freeze x$9_@1 - - read y$10_@1.push - - read props$8.p4 + - dependency: read Component$0 + - dependency: freeze x$9_@1 + - dependency: read y$10_@1.push + - dependency: read props$8.p4 scope6 [14:15]: - - read Component$0 - - read y$10_@1 - - read child$19_@5 + - dependency: read Component$0 + - dependency: read y$10_@1 + - dependency: read child$19_@5 ``` ### CFG