From 552fe1878be8e73118bd18c1a217ca934aebdbb5 Mon Sep 17 00:00:00 2001 From: Joe Savona Date: Wed, 14 Dec 2022 08:42:39 -0800 Subject: [PATCH] Cleanup previous dep collection --- .../playground/components/Editor/Output.tsx | 11 - .../playground/components/TabbedWindow.tsx | 1 - .../src/HIR/InferReactiveScopeDependencies.ts | 248 ------------------ compiler/forget/src/HIR/Pipeline.ts | 6 - compiler/forget/src/HIR/PrintHIR.ts | 24 -- .../_bug_conditional-break-labeled.expect.md | 4 - .../_bug_expression-with-assignment.expect.md | 1 - .../alias-nested-member-path-mutate.expect.md | 1 - .../hir/alias-nested-member-path.expect.md | 4 - .../fixtures/hir/alias-while.expect.md | 3 - .../hir/assignment-variations.expect.md | 2 - .../src/__tests__/fixtures/hir/call.expect.md | 7 - .../fixtures/hir/complex-while.expect.md | 1 - .../fixtures/hir/component.expect.md | 16 -- .../fixtures/hir/conditional-break.expect.md | 23 -- .../hir/conditional-on-mutable.expect.md | 8 - .../fixtures/hir/constructor.expect.md | 7 - .../hir/dependencies-outputs.expect.md | 7 - .../fixtures/hir/dependencies.expect.md | 8 - .../fixtures/hir/extend-scopes-if.expect.md | 4 - .../fixtures/hir/frozen-after-alias.expect.md | 3 - .../fixtures/hir/hook-call.expect.md | 11 - .../hir/hooks-freeze-arguments.expect.md | 3 - ...reeze-possibly-mutable-arguments.expect.md | 5 - .../hir/independent-across-if.expect.md | 9 - .../fixtures/hir/independent.expect.md | 10 - .../hir/interdependent-across-if.expect.md | 10 - .../fixtures/hir/interdependent.expect.md | 9 - .../fixtures/hir/inverted-if.expect.md | 4 - .../__tests__/fixtures/hir/issue852.expect.md | 2 - .../fixtures/hir/jsx-fragment.expect.md | 14 - .../fixtures/hir/logical-expression.expect.md | 11 - .../hir/mutable-lifetime-loops.expect.md | 3 - .../mutable-lifetime-with-aliasing.expect.md | 4 - .../hir/mutable-liverange-loop.expect.md | 3 - ...g-scopes-interleaved-by-terminal.expect.md | 1 - .../overlapping-scopes-interleaved.expect.md | 1 - .../hir/overlapping-scopes-shadowed.expect.md | 4 - ...ng-scopes-shadowing-within-block.expect.md | 8 - .../hir/overlapping-scopes-while.expect.md | 1 - .../overlapping-scopes-within-block.expect.md | 4 - .../hir/property-assignment.expect.md | 7 - .../hir/reactive-scope-grouping.expect.md | 1 - .../fixtures/hir/reactive-scopes-if.expect.md | 8 - .../fixtures/hir/reactive-scopes.expect.md | 7 - .../hir/reassignment-conditional.expect.md | 10 - .../reassignment-separate-scopes.expect.md | 17 -- .../fixtures/hir/reassignment.expect.md | 10 - .../fixtures/hir/reverse-postorder.expect.md | 9 - .../fixtures/hir/simple-alias.expect.md | 2 - .../__tests__/fixtures/hir/simple.expect.md | 6 - .../hir/ssa-arrayexpression.expect.md | 3 - .../fixtures/hir/ssa-call-jsx-2.expect.md | 7 - .../fixtures/hir/ssa-call-jsx.expect.md | 7 - .../hir/ssa-complex-multiple-if.expect.md | 1 - .../hir/ssa-complex-single-if.expect.md | 1 - .../fixtures/hir/ssa-for-of.expect.md | 1 - .../hir/ssa-for-trivial-update.expect.md | 1 - .../__tests__/fixtures/hir/ssa-for.expect.md | 1 - .../fixtures/hir/ssa-if-else.expect.md | 1 - .../fixtures/hir/ssa-multiple-phis.expect.md | 6 - .../ssa-nested-loops-no-reassign.expect.md | 1 - .../hir/ssa-nested-partial-phi.expect.md | 5 - .../ssa-nested-partial-reassignment.expect.md | 5 - .../fixtures/hir/ssa-newexpression.expect.md | 2 - .../hir/ssa-objectexpression-phi.expect.md | 3 - .../hir/ssa-objectexpression.expect.md | 3 - ...a-property-alias-alias-mutate-if.expect.md | 2 - .../hir/ssa-property-alias-if.expect.md | 2 - .../ssa-property-alias-mutate-if.expect.md | 2 - ...-property-alias-mutate-inside-if.expect.md | 2 - .../hir/ssa-property-alias-mutate.expect.md | 1 - .../fixtures/hir/ssa-property-call.expect.md | 2 - .../hir/ssa-property-mutate-2.expect.md | 1 - .../hir/ssa-property-mutate-alias.expect.md | 1 - .../hir/ssa-property-mutate.expect.md | 1 - .../fixtures/hir/ssa-property.expect.md | 2 - .../fixtures/hir/ssa-reassign.expect.md | 1 - .../fixtures/hir/ssa-return.expect.md | 1 - .../fixtures/hir/ssa-shadowing.expect.md | 3 - .../fixtures/hir/ssa-sibling-phis.expect.md | 8 - .../fixtures/hir/ssa-simple-phi.expect.md | 2 - .../fixtures/hir/ssa-simple.expect.md | 1 - .../fixtures/hir/ssa-single-if.expect.md | 1 - .../fixtures/hir/ssa-switch.expect.md | 5 - .../fixtures/hir/ssa-throw.expect.md | 1 - .../hir/ssa-while-no-reassign.expect.md | 1 - .../fixtures/hir/ssa-while.expect.md | 1 - .../hir/switch-non-final-default.expect.md | 7 - .../hir/switch-with-fallthrough.expect.md | 1 - .../__tests__/fixtures/hir/switch.expect.md | 7 - .../hir/transitive-alias-fields.expect.md | 1 - .../type-args-test-binary-operator.expect.md | 1 - .../hir/type-binary-operator.expect.md | 1 - .../fixtures/hir/type-field-load.expect.md | 2 - .../type-test-field-load-binary-op.expect.md | 3 - .../hir/type-test-field-store.expect.md | 1 - .../hir/type-test-polymorphic.expect.md | 3 - .../hir/type-test-primitive.expect.md | 1 - .../type-test-return-type-inference.expect.md | 1 - .../fixtures/hir/while-break.expect.md | 1 - .../hir/while-conditional-continue.expect.md | 1 - compiler/forget/src/index.ts | 2 - 103 files changed, 705 deletions(-) delete mode 100644 compiler/forget/src/HIR/InferReactiveScopeDependencies.ts diff --git a/compiler/forget/packages/playground/components/Editor/Output.tsx b/compiler/forget/packages/playground/components/Editor/Output.tsx index e91abd7498..48c96b328c 100644 --- a/compiler/forget/packages/playground/components/Editor/Output.tsx +++ b/compiler/forget/packages/playground/components/Editor/Output.tsx @@ -28,7 +28,6 @@ const { eliminateRedundantPhi, inferReferenceEffects, inferMutableRanges, - inferReactiveScopeDependencies, inferReactiveScopeVariables, inferReactiveScopes, leaveSSA, @@ -55,7 +54,6 @@ type CompilerOutput = { inferMutableRangesOutput: string; inferReactiveScopeVariablesOutput: string; inferReactiveScopesOutput: string; - inferReactiveScopeDependenciesOutput: string; reactiveFunctionOutput: string; leaveSSAOutput: string; codegenOutput: string; @@ -99,9 +97,6 @@ function compile(source: string): CompilerOutput | CompilerError { inferReactiveScopes(ir); const inferReactiveScopesOutput = printHIR(ir.body); - inferReactiveScopeDependencies(ir); - const inferReactiveScopeDependenciesOutput = printHIR(ir.body); - const reactiveFunction = buildReactiveFunction(ir); const reactiveFunctionOutput = printReactiveFunction(reactiveFunction); @@ -131,7 +126,6 @@ function compile(source: string): CompilerOutput | CompilerError { eliminateRedundantPhiOutput, inferReferenceEffectsOutput, inferMutableRangesOutput, - inferReactiveScopeDependenciesOutput, inferReactiveScopeVariablesOutput, inferReactiveScopesOutput, reactiveFunctionOutput, @@ -205,11 +199,6 @@ function Output({ store, setTabsOpen, tabsOpen }: Props) { output={compilerOutput.inferReactiveScopesOutput} > ), - InferReactiveScopeDependencies: ( - - ), ReactiveFunctions: ( = scope.range.start && instrId < scope.range.end; -} - -class ScopeDependenciesVisitor - implements Visitor -{ - #kinds: Map = new Map(); - #identifiers: Map = new Map(); - // Scopes that are currently active at this point in the traversal - #activeScopes: Set = new Set(); - - get #lastActiveScope(): ReactiveScope | null { - const scopes = [...this.#activeScopes]; - return scopes[scopes.length - 1]; - } - - constructor(fn: HIRFunction) { - if (fn.id !== null) { - this.#identifiers.set(fn.id, makeInstructionId(0)); - this.#kinds.set(fn.id, DeclKind.Const); - } - for (const param of fn.params) { - this.#identifiers.set(param.identifier, makeInstructionId(0)); - this.#kinds.set(param.identifier, DeclKind.Dynamic); - } - } - - #recordActiveScope(scope: ReactiveScope) { - this.#activeScopes.add(scope); - } - - /** - * Prune any scopes that are out of range - */ - #visitId(id: InstructionId): void { - const scopes = [...this.#activeScopes]; - retainWhere(scopes, (pending) => pending.range.end > id); - this.#activeScopes = new Set(scopes); - } - - /** - * Adds a dependency on the terminal operand to the last active scope - */ - #addTerminalDependency(operand: Place): void { - const activeScope = this.#lastActiveScope; - if (activeScope != null) { - const identId = this.#identifiers.get(operand.identifier); - if (identId !== undefined && identId < activeScope.range.start) { - activeScope.dependencies.add(operand); - } - } - } - - visitTerminal( - terminal: BlockTerminal - ): void { - switch (terminal.kind) { - case "if": - case "switch": - case "for": - case "while": { - if (typeof terminal?.test?.kind !== "string") { - console.log(terminal); - } - for (const operand of eachInstructionValueOperand(terminal.test)) { - this.#addTerminalDependency(operand); - } - break; - } - case "return": - case "throw": { - if (terminal.value != null) { - for (const operand of eachInstructionValueOperand(terminal.value)) { - this.#addTerminalDependency(operand); - } - } - break; - } - case "continue": - case "break": { - break; - } - default: - assertExhaustive(terminal, `unhandled terminal ${terminal}`); - } - } - - visitTerminalId(id: InstructionId): void { - this.#visitId(id); - } - - /** - * We don't need to map to a different representation, so just return the value directly - */ - visitValue(value: InstructionValue, id: InstructionId): InstructionValue { - return value; - } - - visitInstruction(instr: Instruction, _value: InstructionValue): void { - this.#visitId(instr.id); - const { lvalue, value } = instr; - if (lvalue !== null && lvalue.place.memberPath === null) { - if (!this.#identifiers.has(lvalue.place.identifier)) { - this.#identifiers.set(lvalue.place.identifier, instr.id); - } - } - - const activeScopes: Set = new Set(); - const dependencies: Array = []; - if (lvalue != null) { - if ( - lvalue.place.identifier.scope !== null && - lvalue.place.memberPath === null && - instructionInScope(instr.id, lvalue.place.identifier.scope) - ) { - activeScopes.add(lvalue.place.identifier.scope); - } else { - dependencies.push(lvalue.place); - } - } - for (const operand of eachInstructionValueOperand(value)) { - if ( - operand.identifier.scope !== null && - instructionInScope(instr.id, operand.identifier.scope) - ) { - activeScopes.add(operand.identifier.scope); - } else { - dependencies.push(operand); - } - } - - for (const scope of activeScopes) { - this.#recordActiveScope(scope); - } - - if (dependencies.length > 0) { - const scope = this.#lastActiveScope; - if (scope != null) { - for (const dep of dependencies) { - const identId = this.#identifiers.get(dep.identifier); - if (identId !== undefined && identId < scope.range.start) { - scope.dependencies.add(dep); - } - } - } - } - } - - enterBlock(): void {} - enterValueBlock(): void {} - enterInitBlock(block: void): void {} - visitImplicitTerminal(): void | null {} - visitCase(test: InstructionValue, block: void): void {} - appendBlock(block: void, item: void, label?: BlockId | undefined): void {} - appendValueBlock(block: void, item: void): void {} - appendInitBlock(block: void, item: void): void {} - leaveBlock(block: void): void {} - leaveValueBlock(block: void, value: InstructionValue): InstructionValue { - return value; - } - leaveInitBlock(block: void): void {} -} - -enum DeclKind { - Const = "Const", - Dynamic = "Dynamic", -} - -function visitOperand( - operand: Place, - dependencies: Set, - declarations: Map -): void { - const kind = declarations.get(operand.identifier); - if (kind === undefined) { - // TODO: global, ignore - return; - } else if (kind === DeclKind.Const) { - // constant, dont need to add a dep - return; - } else { - for (const dep of dependencies) { - // not the same identifier - if (dep.identifier !== operand.identifier) { - continue; - } - const depPath = dep.memberPath; - // existing dep covers all paths - if (depPath === null) { - return; - } - const operandPath = operand.memberPath; - // existing dep is for a path, this operand covers all paths so swap them - if (operandPath === null) { - dependencies.delete(dep); - dependencies.add(operand); - return; - } - // both the operand and dep have paths, determine if the existing path - // is a subset of the new path - let commonPathIndex = 0; - while ( - commonPathIndex < operandPath.length && - commonPathIndex < depPath.length && - operandPath[commonPathIndex] === depPath[commonPathIndex] - ) { - commonPathIndex++; - } - if (commonPathIndex === depPath.length) { - return; - } - } - dependencies.add(operand); - } -} diff --git a/compiler/forget/src/HIR/Pipeline.ts b/compiler/forget/src/HIR/Pipeline.ts index 8de4122349..2be63ba502 100644 --- a/compiler/forget/src/HIR/Pipeline.ts +++ b/compiler/forget/src/HIR/Pipeline.ts @@ -15,7 +15,6 @@ import { leaveSSA } from "../HIR/LeaveSSA"; import codegen from "./Codegen"; import { HIRFunction } from "./HIR"; import { inferMutableRanges } from "./InferMutableRanges"; -import { inferReactiveScopeDependencies } from "./InferReactiveScopeDependencies"; import { inferReactiveScopes } from "./InferReactiveScopes"; import { inferReactiveScopeVariables } from "./InferReactiveScopeVariables"; import { inferTypes } from "./InferTypes"; @@ -83,11 +82,6 @@ export default function ( logHIRFunction("inferReactiveScopes", ir); } - if (flags.inferReactiveScopeDependencies) { - inferReactiveScopeDependencies(ir); - logHIRFunction("inferReactiveScopeDependencies", ir); - } - if (flags.codegen) { return { ast: codegen(ir), diff --git a/compiler/forget/src/HIR/PrintHIR.ts b/compiler/forget/src/HIR/PrintHIR.ts index b2f26ca180..e6f8ec1f5c 100644 --- a/compiler/forget/src/HIR/PrintHIR.ts +++ b/compiler/forget/src/HIR/PrintHIR.ts @@ -25,7 +25,6 @@ import { Terminal, Type, } from "./HIR"; -import { eachReactiveScope } from "./visitors"; export type Options = { indent: number; @@ -34,7 +33,6 @@ export type Options = { export function printFunction(fn: HIRFunction): string { const output = []; output.push(printHIR(fn.body)); - output.push(printReactiveScopes(fn.body)); return output.join("\n"); } @@ -358,25 +356,3 @@ 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/__tests__/fixtures/hir/_bug_conditional-break-labeled.expect.md b/compiler/forget/src/__tests__/fixtures/hir/_bug_conditional-break-labeled.expect.md index ba03c8f3f1..43c93e1c93 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/_bug_conditional-break-labeled.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/_bug_conditional-break-labeled.expect.md @@ -35,10 +35,6 @@ bb1: predecessor blocks: bb0 bb2 [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0:TFunction -scope0 [1:7]: - - dependency: read props$3.a - - dependency: read props$3.d - - dependency: read props$3.c ``` ## Reactive Scopes 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 233a7b8847..a99015a7f6 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 @@ -20,7 +20,6 @@ bb0: [3] Const mutate $6:TPrimitive = Binary read x$5:TPrimitive + read x$5:TPrimitive [4] Const mutate $7:TPrimitive = Binary read $6:TPrimitive + read x$5:TPrimitive [5] Return read $7:TPrimitive - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.expect.md index c8c906081c..c61f6ea00f 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.expect.md @@ -24,7 +24,6 @@ bb0: [5] Reassign mutate x$7_@0.y[1:7] = read y$6_@0:TObject [6] Call mutate mutate$4:TFunction(mutate x$7_@0.y.z) [7] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.expect.md b/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.expect.md index 9a4dc64a09..01d90d1a0e 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.expect.md @@ -23,10 +23,6 @@ bb0: [4] Const mutate x$6_@2:TObject[4:6] = Object { } [5] Reassign mutate x$6_@2.y[4:6] = read y$5_@1:TObject [6] Return freeze x$6_@2:TObject -scope1 [2:4]: - - dependency: read z$4_@0 -scope2 [4:6]: - - dependency: read y$5_@1:TObject ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-while.expect.md b/compiler/forget/src/__tests__/fixtures/hir/alias-while.expect.md index 63baadfa18..e9e2f1afcd 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/alias-while.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/alias-while.expect.md @@ -48,8 +48,6 @@ bb2: [13] read b$9_@0:TObject [14] read c$10_@0:TObject [15] Return freeze a$8_@0:TObject -scope0 [1:12]: - - dependency: read cond$7 ``` ## Reactive Scopes @@ -107,7 +105,6 @@ function foo$0(cond$7) { ``` bb0: [1] Return - ``` ## Reactive Scopes 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 d13c498722..68db3cb51a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md @@ -28,7 +28,6 @@ bb0: [6] Const mutate $10:TPrimitive = 1 [7] Const mutate x$11:TPrimitive = Binary read x$9:TPrimitive >>> read $10:TPrimitive [8] Return - ``` ## Reactive Scopes @@ -68,7 +67,6 @@ bb0: [3] Const mutate $6:TPrimitive = 2 [4] Reassign mutate a$4_@0.b.c[0:5] = Binary read a$4_@0.b.c * read $6:TPrimitive [5] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/call.expect.md b/compiler/forget/src/__tests__/fixtures/hir/call.expect.md index a37231dc6a..1b9c8555ab 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/call.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/call.expect.md @@ -20,7 +20,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -52,12 +51,6 @@ bb0: [7] Const mutate $14:TPrimitive = "div" [8] Const mutate $15_@2 = JSX [9] Return read $15_@2 -scope1 [5:6]: - - dependency: read $12:TPrimitive -scope2 [8:9]: - - dependency: read $14:TPrimitive - - dependency: read a$10_@0:TObject - - dependency: freeze b$11_@0:TObject ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/complex-while.expect.md b/compiler/forget/src/__tests__/fixtures/hir/complex-while.expect.md index f5d0e09afe..fbc5d1a45a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/complex-while.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/complex-while.expect.md @@ -34,7 +34,6 @@ bb7: bb1: predecessor blocks: bb6 bb4 bb0 [6] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/component.expect.md b/compiler/forget/src/__tests__/fixtures/hir/component.expect.md index c7568eb220..97aad9dbbb 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/component.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/component.expect.md @@ -100,22 +100,6 @@ bb2: [40] Const mutate $73 = "\n " [41] Const mutate $74_@5 = JSX {read $68}{read $71_@4}{read $72}{freeze renderedItems$32_@0:TFunction}{read $73} [42] Return read $74_@5 -scope2 [6:7]: - - dependency: read $34:TPrimitive - - dependency: read maxItems$31:TProp -scope3 [24:25]: - - dependency: read $49:TPrimitive -scope4 [38:39]: - - dependency: read $69:TPrimitive - - dependency: freeze count$66:TProp - - dependency: read $70 -scope5 [41:42]: - - dependency: read $67:TPrimitive - - dependency: read $68 - - dependency: read $71_@4 - - dependency: read $72 - - dependency: freeze renderedItems$32_@0:TFunction - - dependency: read $73 ``` ## Reactive Scopes 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 a8ed7d690e..0cb641c05a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md @@ -89,10 +89,6 @@ bb1: predecessor blocks: bb0 [6] Call mutate a_DEBUG$5_@0.push(read props$4.d) [7] Return freeze a_DEBUG$5_@0:TFunction -scope0 [1:7]: - - dependency: read props$4.a - - dependency: read props$4.b - - dependency: read props$4.d ``` ## Reactive Scopes @@ -145,11 +141,6 @@ bb1: predecessor blocks: bb2 bb0 [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0:TFunction -scope0 [1:7]: - - dependency: read props$3.a - - dependency: read props$3.c - - dependency: read props$3.b - - dependency: read props$3.d ``` ## Reactive Scopes @@ -202,11 +193,6 @@ bb1: predecessor blocks: bb0 [7] Call mutate a$5_@0.push(read props$4.d) [8] Return freeze a$5_@0:TFunction -scope0 [1:8]: - - dependency: read props$4.a - - dependency: read props$4.c - - dependency: read props$4.b - - dependency: read props$4.d ``` ## Reactive Scopes @@ -261,11 +247,6 @@ bb1: predecessor blocks: bb0 [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0:TFunction -scope0 [1:7]: - - dependency: read props$3.a - - dependency: read props$3.c - - dependency: read props$3.b - - dependency: read props$3.d ``` ## Reactive Scopes @@ -319,10 +300,6 @@ bb1: predecessor blocks: bb0 bb2 [6] Call mutate a$4_@0.push(read props$3.d) [7] Return freeze a$4_@0:TFunction -scope0 [1:7]: - - dependency: read props$3.a - - dependency: read props$3.d - - dependency: read props$3.c ``` ## Reactive Scopes 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 08c567918f..2bd5086243 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,9 +53,6 @@ bb3: predecessor blocks: bb4 bb1 [9] Const mutate $16_@2 = JSX [10] Return read $16_@2 -scope2 [9:10]: - - dependency: freeze a$7_@0:TFunction - - dependency: freeze b$8_@0:TFunction ``` ## Reactive Scopes @@ -123,9 +120,6 @@ bb3: predecessor blocks: bb4 bb1 [10] Const mutate $19_@2 = JSX [11] Return read $19_@2 -scope2 [10:11]: - - dependency: freeze a$9_@0:TFunction - - dependency: freeze b$10_@0:TFunction ``` ## Reactive Scopes @@ -176,7 +170,6 @@ function Component$0(props$8) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -200,7 +193,6 @@ function Foo$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md b/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md index ea7af28626..bc8487896c 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md @@ -20,7 +20,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -52,12 +51,6 @@ bb0: [7] Const mutate $14:TPrimitive = "div" [8] Const mutate $15_@2 = JSX [9] Return read $15_@2 -scope1 [5:6]: - - dependency: read $12:TPrimitive -scope2 [8:9]: - - dependency: read $14:TPrimitive - - dependency: read a$10_@0 - - dependency: freeze b$11_@0:TObject ``` ## Reactive Scopes 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 90f2791ab5..3cbcb55e92 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md @@ -42,13 +42,6 @@ bb4: bb3: predecessor blocks: bb4 bb1 [12] Return -scope0 [1:3]: - - dependency: read a$6 -scope1 [5:12]: - - dependency: read x$8_@0:TFunction - - dependency: read x$8_@0.length - - dependency: read b$7:TFunction - - dependency: read b$7:TFunction ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md b/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md index df680a2a74..be14e86f71 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md @@ -42,14 +42,6 @@ bb4: bb3: predecessor blocks: bb4 bb1 [10] Return freeze items2$10_@1:TFunction -scope0 [1:10]: - - dependency: read z$8 - - dependency: read x$6 - - dependency: read x$6 - - dependency: read y$7 -scope1 [3:7]: - - dependency: read y$7 - - dependency: read x$6 ``` ## Reactive Scopes 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 58add3a300..580e095e80 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 @@ -46,10 +46,6 @@ bb7: predecessor blocks: bb1 [10] Const mutate $13:TPrimitive = null [11] Return read $13:TPrimitive -scope0 [1:8]: - - dependency: read c$9 - - dependency: read b$8 - - dependency: read a$7 ``` ## Reactive Scopes 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 b3382a10d9..8b95499f25 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 @@ -23,7 +23,6 @@ bb0: [3] Call read useFreeze$3:TFunction(freeze a$5_@0) [4] Call mutate foo$4:TFunction(read b$6) [5] Return - ``` ## Reactive Scopes @@ -58,7 +57,6 @@ function Component$0() { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -82,7 +80,6 @@ function useFreeze$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes 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 6134ef4660..06d8f5beed 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md @@ -24,7 +24,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -48,7 +47,6 @@ function useFreeze$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -79,15 +77,6 @@ bb0: [6] Const mutate $15 = "\n " [7] Const mutate $16_@2 = JSX {read $13}{read x$11_@0}{read $14}{read y$12_@1}{read $15} [8] Return read $16_@2 -scope1 [2:3]: - - dependency: freeze x$11_@0 -scope2 [7:8]: - - dependency: read Component$0 - - dependency: read $13 - - dependency: read x$11_@0 - - dependency: read $14 - - dependency: read y$12_@1 - - dependency: read $15 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.expect.md b/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.expect.md index 9a154a7add..45ef21977d 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.expect.md @@ -24,7 +24,6 @@ bb0: [3] Call read useFreeze$2:TFunction(read a$4_@0) [4] Call mutate call$3:TFunction(read a$4_@0) [5] Return read a$4_@0 - ``` ## Reactive Scopes @@ -60,7 +59,6 @@ function Component$0() { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -85,7 +83,6 @@ function useFreeze$0(x$2) {} ``` bb0: [1] Return - ``` ## Reactive Scopes 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 8c18c197e2..498b8d101e 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 @@ -45,9 +45,6 @@ bb1: [10] Call read useFreeze$5:TFunction(read a$11_@0:TProp) [11] Call mutate call$6:TFunction(read a$11_@0:TProp) [12] Return read a$11_@0:TProp -scope0 [4:9]: - - dependency: read x$9:TProp - - dependency: read cond$8:TProp ``` ## Reactive Scopes @@ -101,7 +98,6 @@ function Component$0(props$7) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -126,7 +122,6 @@ function useFreeze$0(x$2) {} ``` bb0: [1] Return - ``` ## Reactive Scopes 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 14f664b97c..866ce120e9 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 @@ -38,7 +38,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -62,7 +61,6 @@ function compute$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -86,7 +84,6 @@ function mutate$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -110,7 +107,6 @@ function foo$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -145,11 +141,6 @@ bb1: predecessor blocks: bb2 bb0 [7] Const mutate $14_@2 = JSX [8] Return read $14_@2 -scope1 [1:7]: - - dependency: read props$8.a -scope2 [7:8]: - - dependency: freeze a$9_@1 - - dependency: freeze b$10_@1 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md b/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md index 08ef5815af..8ddff9cbf7 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md @@ -32,13 +32,6 @@ bb0: [2] Const mutate b$9_@1 = Call mutate compute$3:TFunction(read props$7.b) [3] Const mutate $10_@2 = JSX [4] Return read $10_@2 -scope0 [1:2]: - - dependency: read props$7.a -scope1 [2:3]: - - dependency: read props$7.b -scope2 [3:4]: - - dependency: freeze a$8_@0 - - dependency: freeze b$9_@1 ``` ## Reactive Scopes @@ -76,7 +69,6 @@ function Component$0(props$7) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -100,7 +92,6 @@ function compute$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -124,7 +115,6 @@ function foo$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes 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 c705d41311..594747a09e 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 @@ -32,7 +32,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -56,7 +55,6 @@ function compute$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -80,7 +78,6 @@ function foo$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -114,13 +111,6 @@ bb1: predecessor blocks: bb2 bb0 [6] Const mutate $14_@1 = JSX [7] Return read $14_@1 -scope0 [1:6]: - - dependency: read props$8.a - - dependency: read props$8.b - - dependency: read props$8.c -scope1 [6:7]: - - dependency: freeze a$9_@0 - - dependency: freeze b$10_@0 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md b/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md index 037740e512..101dd51539 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md @@ -33,12 +33,6 @@ bb0: [3] Call mutate foo$5:TFunction(mutate a$9_@0, mutate b$10_@0) [4] Const mutate $11_@1 = JSX [5] Return read $11_@1 -scope0 [1:4]: - - dependency: read props$8.a - - dependency: read props$8.b -scope1 [4:5]: - - dependency: freeze a$9_@0 - - dependency: freeze b$10_@0 ``` ## Reactive Scopes @@ -76,7 +70,6 @@ function Component$0(props$8) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -100,7 +93,6 @@ function compute$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -124,7 +116,6 @@ function foo$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes 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 35e8bcd044..b8ad9863b9 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md @@ -30,10 +30,6 @@ bb5: bb1: predecessor blocks: bb5 bb3 bb0 [6] Return -scope0 [1:6]: - - dependency: read c$7 - - dependency: read b$6 - - dependency: read a$5 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md b/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md index 7697eb27f0..a172e2287b 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md @@ -20,8 +20,6 @@ bb0: [3] Const mutate a$8:TObject = read x$7_@0:TObject [4] Const mutate b$9:TObject = read a$8:TObject [5] Return -scope0 [1:3]: - - dependency: read c$6 ``` ## Reactive Scopes 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 9bd0394e9d..aadb1c2346 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md @@ -31,20 +31,6 @@ bb0: [10] Const mutate $23 = "\n " [11] Const mutate $24_@2 = JsxFragment [read $14, read props$13.greeting, read $15:TPrimitive, read $16, read $22_@1, read $23] [12] Return read $24_@2 -scope0 [7:8]: - - dependency: read $19 -scope1 [9:10]: - - dependency: read $17:TPrimitive - - dependency: read $18 - - dependency: read $20_@0 - - dependency: read $21 -scope2 [11:12]: - - dependency: read $14 - - dependency: read props$13.greeting - - dependency: read $15:TPrimitive - - dependency: read $16 - - dependency: read $22_@1 - - dependency: read $23 ``` ## Reactive Scopes 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 c06cdf04fd..a843af5315 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md @@ -37,9 +37,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [7] Return freeze $6_@1 -scope1 [2:7]: - - dependency: read $5_@0 - - dependency: read $5_@0 ``` ## Reactive Scopes @@ -92,9 +89,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [7] Return freeze $6_@1 -scope1 [2:7]: - - dependency: read $5_@0 - - dependency: read $5_@0 ``` ## Reactive Scopes @@ -149,9 +143,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [9] Return freeze $12_@1:TPrimitive -scope1 [4:9]: - - dependency: read $9_@0:TPrimitive - - dependency: read $11:TPrimitive ``` ## Reactive Scopes @@ -194,7 +185,6 @@ function QuestionQuestion$0(props$8) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -218,7 +208,6 @@ function f$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes diff --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 index 6d3c869169..6bcedb211a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-loops.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-loops.expect.md @@ -44,7 +44,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -70,7 +69,6 @@ function mutate$0(x$3, y$4) {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -133,7 +131,6 @@ bb13: [21] Const mutate $34:TPrimitive = null [22] Call mutate mutate$7:TFunction(mutate d$24_@0, read $34:TPrimitive) [23] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.expect.md b/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.expect.md index a4083f709b..388a304f46 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.expect.md @@ -40,7 +40,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -90,9 +89,6 @@ bb9: [13] Const mutate $17:TPrimitive = null [14] Call mutate mutate$8:TFunction(mutate x$15_@1:TObject, read $17:TPrimitive) [15] Return -scope1 [2:15]: - - dependency: read a$11_@0:TObject - - dependency: read a$11_@0:TObject ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.expect.md b/compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.expect.md index 8f7249c0a0..5a6e6d3a26 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.expect.md @@ -39,7 +39,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -63,7 +62,6 @@ function mutate$0() {} ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -120,7 +118,6 @@ bb13: [16] Const mutate $28:TPrimitive = null [17] Call mutate mutate$6:TFunction(mutate d$15_@0:TObject, read $28:TPrimitive) [18] Return - ``` ## Reactive Scopes 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 6a636bf552..51a9d0c64d 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,7 +27,6 @@ bb1: [4] Call mutate y$10_@0.push(read a$6) [5] Call mutate x$9_@0.push(read b$7) [6] Return - ``` ## Reactive Scopes 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 b549160000..95e651d10a 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,7 +20,6 @@ bb0: [3] Call mutate x$7_@0.push(read a$5) [4] Call mutate y$8_@0.push(read b$6) [5] Return - ``` ## Reactive Scopes 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 a9830926d2..605655791c 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 @@ -20,10 +20,6 @@ bb0: [3] Call mutate y$8_@1.push(read b$6) [4] Call mutate x$7_@0.push(read a$5) [5] Return -scope0 [1:5]: - - dependency: read a$5 -scope1 [2:4]: - - dependency: read b$6 ``` ## Reactive Scopes 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 71af081138..4d4ee613af 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 @@ -40,14 +40,6 @@ bb3: bb1: predecessor blocks: bb3 bb0 [11] Return freeze x$11_@0:TFunction -scope0 [1:11]: - - dependency: read a$8 -scope1 [3:7]: - - dependency: read c$10 - - dependency: read b$9 -scope2 [8:9]: - - dependency: read $13:TPrimitive - - dependency: freeze y$12_@1:TFunction ``` ## Reactive Scopes 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 f677abaa32..2e70434204 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,7 +31,6 @@ bb3: bb2: predecessor blocks: bb1 [8] Return - ``` ## Reactive Scopes 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 faae7e4ac9..dc05e8548c 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 @@ -38,10 +38,6 @@ bb3: bb1: predecessor blocks: bb3 bb0 [9] Return freeze x$9_@0:TFunction -scope0 [1:9]: - - dependency: read c$8 - - dependency: read b$7 - - dependency: read a$6 ``` ## Reactive Scopes 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 266342afa0..86d8fdf8df 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md @@ -24,13 +24,6 @@ bb0: [5] Call mutate x$7_@0.y.push(read props$6.p0) [6] Const mutate $10_@1 = JSX {read child$9_@0} [7] Return read $10_@1 -scope0 [1:6]: - - dependency: read Component$0 - - dependency: read props$6.p0 -scope1 [6:7]: - - dependency: read Component$0 - - dependency: freeze x$7_@0:TObject - - dependency: read child$9_@0 ``` ## Reactive Scopes 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 946e0db868..e1a823352c 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 @@ -24,7 +24,6 @@ bb0: [4] Call mutate y$5_@1.push(mutate z$6_@1:TObject) [5] Reassign mutate x$4_@0.y[1:6] = read y$5_@1:TFunction [6] Return freeze x$4_@0:TObject - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.expect.md index 100dcbfd2e..f2ca693adc 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.expect.md @@ -37,14 +37,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [11] Return freeze x$11_@0:TFunction -scope0 [1:11]: - - dependency: read c$10 - - dependency: read a$8 -scope1 [3:5]: - - dependency: read b$9 -scope2 [6:7]: - - dependency: read $13:TPrimitive - - dependency: freeze y$12_@1:TFunction ``` ## Reactive Scopes 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 8e589e4ce0..5ca2dcfe50 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md @@ -35,13 +35,6 @@ bb1: [8] Const mutate $13:TPrimitive = "div" [9] Const mutate $15_@1 = JSX {freeze x$10_@0:TFunction} [10] Return read $15_@1 -scope0 [1:8]: - - dependency: read a$8.length - - dependency: read b$9 - - dependency: read b$9 -scope1 [9:10]: - - dependency: read $13:TPrimitive - - dependency: freeze x$10_@0:TFunction ``` ## Reactive Scopes 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 977477868f..456df76bf6 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md @@ -37,16 +37,6 @@ bb1: [8] Call read y$8.push(read props$6.p2) [9] Const mutate $15_@2 = JSX [10] Return read $15_@2 -scope0 [1:7]: - - dependency: read props$6.p0 - - dependency: read props$6.p1 -scope1 [7:8]: - - dependency: read Component$0 - - dependency: freeze x$7_@0:TFunction -scope2 [9:10]: - - dependency: read Component$0 - - dependency: read x$7_@0:TFunction - - dependency: read y$8:TFunction ``` ## Reactive Scopes 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 6a27394d8b..c6f295c7c9 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 @@ -68,23 +68,6 @@ bb3: [18] Const mutate $28 = "\n " [19] Const mutate $31_@3 = JSX {read $26}{read y$19_@1}{read $27}{freeze x$22_@2:TFunction}{read $28} [20] Return read $31_@3 -scope0 [1:5]: - - dependency: read a$13 - - dependency: read a$13 -scope1 [6:7]: - - dependency: read $17:TPrimitive - - dependency: freeze x$16_@0:TFunction -scope2 [8:15]: - - dependency: read c$15 - - dependency: read b$14 - - dependency: read b$14 -scope3 [19:20]: - - dependency: read $25:TPrimitive - - dependency: read $26 - - dependency: read y$19_@1 - - dependency: read $27 - - dependency: freeze x$22_@2:TFunction - - dependency: read $28 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md b/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md index 0a0e90d9a8..8e3ca9c507 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md @@ -29,16 +29,6 @@ bb0: [6] Call mutate y$8_@0.push(read props$6.p1) [7] Const mutate $11_@3 = JSX [8] Return read $11_@3 -scope0 [1:7]: - - dependency: read props$6.p0 - - dependency: read props$6.p1 -scope2 [5:6]: - - dependency: read Component$0 - - dependency: freeze x$9_@1 -scope3 [7:8]: - - dependency: read Component$0 - - dependency: read x$9_@1 - - dependency: freeze y$8_@0:TFunction ``` ## Reactive Scopes 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 c0f566534c..9965a3d4a1 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md @@ -77,15 +77,6 @@ bb1: predecessor blocks: bb8 bb6 bb4 bb12 bb13 [18] read x$11_@0:TProp [19] Return -scope0 [2:18]: - - 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 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-alias.expect.md b/compiler/forget/src/__tests__/fixtures/hir/simple-alias.expect.md index 36b3a4a870..14276098e3 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/simple-alias.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/simple-alias.expect.md @@ -21,7 +21,6 @@ function foo() { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -52,7 +51,6 @@ bb0: [6] Const mutate c$10_@1:TObject[2:8] = read a$8_@1:TObject [7] Call mutate mutate$4:TFunction(mutate a$8_@1:TObject, mutate b$9_@1:TObject) [8] Return freeze c$10_@1:TObject - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md b/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md index 6a3ef8a9ca..3b99c718c6 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md @@ -27,12 +27,6 @@ bb1: [6] Const mutate $13:TPrimitive = Binary read y$9:TPrimitive * read $12:TPrimitive [7] Const mutate $14_@1 = Array [read $13:TPrimitive] [8] Return freeze $14_@1 -scope0 [3:4]: - - dependency: read foo$0:TFunction - - dependency: read $10:TPrimitive - - dependency: read y$9:TPrimitive -scope1 [7:8]: - - dependency: read $13:TPrimitive ``` ## Reactive Scopes 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 1345b155bb..e7ca3bc595 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md @@ -19,9 +19,6 @@ bb0: [2] Const mutate b$7:TPrimitive = 2 [3] Const mutate x$8_@0 = Array [read a$6:TPrimitive, read b$7:TPrimitive] [4] Return freeze x$8_@0 -scope0 [3:4]: - - dependency: read a$6:TPrimitive - - dependency: read b$7:TPrimitive ``` ## Reactive Scopes 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 d4af38d48e..dbe67edb77 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 @@ -23,7 +23,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -62,12 +61,6 @@ bb1: [10] Const mutate $19:TPrimitive = "div" [11] Const mutate $20_@3 = JSX [12] Return read $20_@3 -scope2 [7:8]: - - dependency: read $14:TPrimitive -scope3 [11:12]: - - dependency: read $19:TPrimitive - - dependency: freeze a$11_@0 - - dependency: freeze b$12_@0:TObject ``` ## Reactive Scopes 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 5351013265..90e763beb8 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 @@ -20,7 +20,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -52,12 +51,6 @@ bb0: [7] Const mutate $14:TPrimitive = "div" [8] Const mutate $15_@2 = JSX [9] Return read $15_@2 -scope1 [5:6]: - - dependency: read $12:TPrimitive -scope2 [8:9]: - - dependency: read $14:TPrimitive - - dependency: read a$10_@0 - - dependency: freeze b$11_@0:TObject ``` ## Reactive Scopes 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 19bfa86bed..f3c5c401e3 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 @@ -43,7 +43,6 @@ bb3: predecessor blocks: bb4 bb1 [13] Const mutate y$18 = read x$7_@0:TPrimitive [14] Return - ``` ## Reactive Scopes 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 fed70b20d1..5afc83745b 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 @@ -31,7 +31,6 @@ bb1: predecessor blocks: bb2 bb0 [8] Const mutate y$11 = read x$5_@0:TPrimitive [9] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for-of.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-for-of.expect.md index 7b7193f07e..265b47a64e 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-for-of.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-for-of.expect.md @@ -38,7 +38,6 @@ bb4: bb2: predecessor blocks: bb1 [9] Return freeze items$5_@0 - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.expect.md index ece7a4e3bc..285f66f240 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.expect.md @@ -39,7 +39,6 @@ bb4: bb2: predecessor blocks: bb1 [13] Return read x$6_@0:TPrimitive - ``` ## Reactive Scopes 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 c9bd9a023d..55fe8d2464 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md @@ -41,7 +41,6 @@ bb4: bb2: predecessor blocks: bb1 [15] Return read x$7_@1:TPrimitive - ``` ## Reactive Scopes 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 932d28a0ad..f7f1cfd83e 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 @@ -33,7 +33,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [8] Return - ``` ## Reactive Scopes 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 36cb702aba..7731a4cb31 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 @@ -68,12 +68,6 @@ bb1: predecessor blocks: bb3 bb7 [20] read x$18_@0 [21] Return -scope0 [3:20]: - - dependency: read a$9 - - dependency: read b$10 - - dependency: read c$11 - - dependency: read d$12 - - dependency: read $14:TPrimitive ``` ## Reactive Scopes 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 5aae4c40ff..bd8c08e4ed 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 @@ -52,7 +52,6 @@ bb5: bb2: predecessor blocks: bb1 [13] Return read x$9:TPrimitive - ``` ## Reactive Scopes 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 0cfe9bfcfa..c9289dc291 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 @@ -34,11 +34,6 @@ bb3: bb1: predecessor blocks: bb3 bb0 [8] Return -scope0 [1:8]: - - dependency: read a$5 - - dependency: read c$7 - - dependency: read c$7 - - dependency: read b$6 ``` ## Reactive Scopes 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 474baa8466..c1385082b8 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 @@ -36,11 +36,6 @@ bb5: bb1: predecessor blocks: bb2 bb5 bb3 [8] Return read x$12_@0:TPrimitive -scope0 [1:8]: - - dependency: read b$8 - - dependency: read d$10 - - dependency: read c$9 - - dependency: read a$7 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.expect.md index b7ff831934..00e432c57a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.expect.md @@ -18,7 +18,6 @@ function Component(props) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -45,7 +44,6 @@ bb0: [2] Const mutate b$8_@0:TObject[1:4] = Object { } [3] Const mutate c$9_@0[1:4] = New mutate Foo$5(mutate a$7_@0, mutate b$8_@0:TObject) [4] Return freeze c$9_@0 - ``` ## Reactive Scopes 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 cc6716106f..94f90cd4b8 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 @@ -39,9 +39,6 @@ bb1: predecessor blocks: bb2 bb3 [10] Const mutate t$14_@2:TObject = Object { x: read x$6_@0:TPrimitive, y: read y$7_@0:TPrimitive } [11] Return freeze t$14_@2:TObject -scope2 [10:11]: - - dependency: read x$6_@0:TPrimitive - - dependency: read y$7_@0:TPrimitive ``` ## Reactive Scopes 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 b9f187f479..d96c58babf 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md @@ -19,9 +19,6 @@ bb0: [2] Const mutate b$7:TPrimitive = 2 [3] Const mutate x$8_@0:TObject = Object { a: read a$6:TPrimitive, b: read b$7:TPrimitive } [4] Return freeze x$8_@0:TObject -scope0 [3:4]: - - dependency: read a$6:TPrimitive - - dependency: read b$7:TPrimitive ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.expect.md index abb2cbf733..5ba2df45ef 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.expect.md @@ -39,8 +39,6 @@ bb1: predecessor blocks: bb2 bb3 [10] Call mutate mutate$6:TFunction(mutate b$8_@0:TObject) [11] Return freeze x$9_@0:TObject -scope0 [1:11]: - - dependency: read a$7 ``` ## Reactive Scopes 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 69d9eff800..c095ef88b1 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 @@ -35,8 +35,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [9] Return freeze x$6_@0:TObject -scope0 [1:9]: - - dependency: read a$5 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.expect.md index 88f37a3217..ff37090a05 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.expect.md @@ -37,8 +37,6 @@ bb1: predecessor blocks: bb2 bb3 [9] Call mutate mutate$5:TFunction(mutate x$7_@0:TObject) [10] Return freeze x$7_@0:TObject -scope0 [1:10]: - - dependency: read a$6 ``` ## Reactive Scopes 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 175da4727e..091a3694d2 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 @@ -37,8 +37,6 @@ bb3: bb1: predecessor blocks: bb2 bb3 [10] Return freeze x$7_@0:TObject -scope0 [1:10]: - - dependency: read a$6 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.expect.md index d36972c9a6..9feeb8e82c 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.expect.md @@ -25,7 +25,6 @@ bb0: [4] Reassign mutate y$7_@0.x[1:6] = read x$6_@0:TObject [5] Call mutate mutate$4:TFunction(mutate a$5_@0:TObject) [6] Return freeze y$7_@0:TObject - ``` ## Reactive Scopes 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 7942b54e28..bcad41b64f 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 @@ -20,8 +20,6 @@ bb0: [3] Const mutate $6_@1[2:5] = Array [] [4] Call mutate y$5_@1.x.push(mutate $6_@1) [5] Return freeze y$5_@1:TObject -scope1 [2:5]: - - dependency: read x$4_@0 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.expect.md index 0e7e1dc0cc..d8dadeafc1 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.expect.md @@ -21,7 +21,6 @@ bb0: [3] Reassign mutate y$5_@0.x[1:5] = read x$4_@0 [4] Call mutate mutate$3:TFunction(mutate x$4_@0) [5] Return freeze y$5_@0:TObject - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.expect.md index ceba143847..d512fdfcb1 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.expect.md @@ -25,7 +25,6 @@ bb0: [4] Reassign mutate y$6_@0.x[1:6] = read x$7_@0 [5] Call mutate mutate$4:TFunction(mutate a$5_@0:TObject) [6] Return freeze y$6_@0:TObject - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.expect.md index 50355b4b5b..594ab62d9b 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.expect.md @@ -21,7 +21,6 @@ bb0: [3] Reassign mutate y$5_@0.x[1:5] = read x$4_@0 [4] Call mutate mutate$3:TFunction(mutate y$5_@0:TObject) [5] Return freeze y$5_@0:TObject - ``` ## Reactive Scopes 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 e7d6582d7c..8318351d20 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md @@ -19,8 +19,6 @@ bb0: [2] Const mutate y$4_@1:TObject[2:4] = Object { } [3] Reassign mutate y$4_@1.x[2:4] = read x$3_@0 [4] Return freeze y$4_@1:TObject -scope1 [2:4]: - - dependency: read x$3_@0 ``` ## Reactive Scopes 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 23f937699f..8dfba9fdc1 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md @@ -21,7 +21,6 @@ bb0: [3] Const mutate x$10 = read b$6 [4] Const mutate x$11 = read c$7 [5] Return read x$11 - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-return.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-return.expect.md index a3ba68acfb..97e9dc808a 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-return.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-return.expect.md @@ -28,7 +28,6 @@ bb2: bb1: predecessor blocks: bb2 bb0 [7] Return read x$4_@0:TPrimitive - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.expect.md index 6f211cc500..c329c4e537 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.expect.md @@ -22,7 +22,6 @@ function Foo(cond) { ``` bb0: [1] Return - ``` ## Reactive Scopes @@ -60,8 +59,6 @@ bb1: predecessor blocks: bb2 bb3 [8] Call mutate log$4:TFunction(read str$6_@0:TPrimitive) [9] Return -scope0 [1:8]: - - dependency: read cond$5 ``` ## Reactive Scopes 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 6ce23eba87..0bdb9ae6ca 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 @@ -68,14 +68,6 @@ bb7: bb1: predecessor blocks: bb3 bb7 [20] Return -scope0 [5:10]: - - dependency: read a$9 - - dependency: read b$10 - - dependency: read $15:TPrimitive -scope1 [13:18]: - - dependency: read c$11 - - dependency: read d$12 - - dependency: read $19:TPrimitive ``` ## Reactive Scopes 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 8e3c94e612..dc0f89a778 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 @@ -37,8 +37,6 @@ bb1: predecessor blocks: bb2 bb3 [9] Const mutate x$11 = read y$8_@0:TPrimitive [10] Return -scope0 [4:9]: - - dependency: read $7:TPrimitive ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-simple.expect.md index 4d5f3564f4..3e968a618f 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-simple.expect.md @@ -16,7 +16,6 @@ bb0: [1] Const mutate x$3:TPrimitive = 1 [2] Const mutate y$4:TPrimitive = 2 [3] Return - ``` ## Reactive Scopes 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 041574d7b9..5252950eab 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 @@ -27,7 +27,6 @@ bb2: bb1: predecessor blocks: bb2 bb0 [6] Return - ``` ## Reactive Scopes 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 aa6d35b406..9687b6ecbd 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md @@ -58,11 +58,6 @@ bb1: predecessor blocks: bb5 bb3 bb2 [16] Const mutate y$22 = read x$16_@0:TPrimitive [17] Return -scope0 [6:16]: - - dependency: read x$10:TPrimitive - - dependency: read x$10:TPrimitive - - dependency: read x$10:TPrimitive - - dependency: read x$10:TPrimitive ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-throw.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-throw.expect.md index 29436fa233..af12a70773 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-throw.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-throw.expect.md @@ -27,7 +27,6 @@ bb2: bb1: predecessor blocks: bb2 bb0 [7] Throw read x$4_@0:TPrimitive - ``` ## Reactive Scopes 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 162312b0ea..36641969a8 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 @@ -32,7 +32,6 @@ bb3: bb2: predecessor blocks: bb1 [9] Return read x$5:TPrimitive - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-while.expect.md b/compiler/forget/src/__tests__/fixtures/hir/ssa-while.expect.md index a3892fdc1f..838912cfb9 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/ssa-while.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/ssa-while.expect.md @@ -32,7 +32,6 @@ bb3: bb2: predecessor blocks: bb1 [9] Return read x$5_@0:TPrimitive - ``` ## Reactive Scopes 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 5d260ba95b..c27f17696f 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,13 +58,6 @@ bb1: [13] Call read y$11_@1.push(read props$9.p4) [14] Const mutate $22_@3 = JSX {read child$19_@2} [15] Return read $22_@3 -scope2 [12:13]: - - dependency: read Component$0 - - dependency: freeze x$10_@1:TFunction -scope3 [14:15]: - - dependency: read Component$0 - - dependency: freeze y$11_@1:TPrimitive - - dependency: read child$19_@2 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.expect.md b/compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.expect.md index 3c2bb7cf1d..558cd7ae94 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.expect.md @@ -79,7 +79,6 @@ bb2: bb1: predecessor blocks: bb9 bb0 bb5 bb2 [21] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md b/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md index d33e7f9289..7a9a22c43f 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md @@ -52,13 +52,6 @@ bb1: [13] Call read y$10_@1.push(read props$8.p4) [14] Const mutate $23_@4 = JSX {read child$19_@3} [15] Return read $23_@4 -scope3 [12:13]: - - dependency: read Component$0 - - dependency: freeze x$9_@1:TFunction -scope4 [14:15]: - - dependency: read Component$0 - - dependency: read y$10_@1:TPrimitive - - dependency: read child$19_@3 ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.expect.md b/compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.expect.md index b377fea5da..20b4b58bea 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.expect.md @@ -30,7 +30,6 @@ bb0: [7] Reassign mutate q$8_@0.y[1:9] = read p$7_@0.y [8] Call mutate mutate$5:TFunction(mutate q$8_@0:TObject) [9] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.expect.md index 0fc5910c3d..27b6891db1 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.expect.md @@ -23,7 +23,6 @@ bb2: bb1: predecessor blocks: bb2 bb0 [5] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.expect.md index 23adc01b74..f958d5ff40 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.expect.md @@ -27,7 +27,6 @@ bb2: bb1: predecessor blocks: bb2 bb0 [7] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-field-load.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-field-load.expect.md index e5fd0afcda..8be5c28234 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-field-load.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-field-load.expect.md @@ -17,8 +17,6 @@ bb0: [2] Const mutate x$5_@0:TObject = Object { t: read $4:TPrimitive } [3] Const mutate p$6:TPrimitive = read x$5_@0.t [4] Return -scope0 [2:3]: - - dependency: read $4:TPrimitive ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.expect.md index 10479fafcf..2d11212d2d 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.expect.md @@ -31,9 +31,6 @@ bb1: [8] Const mutate y$16:TPrimitive = read x$12_@2.u [9] Const mutate z$17:TPrimitive = read x$12_@2.v [10] Return -scope2 [3:4]: - - dependency: read $10_@0:TPrimitive - - dependency: read $11_@1:TPrimitive ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.expect.md index d501e48768..6a1723b918 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.expect.md @@ -20,7 +20,6 @@ bb0: [3] Reassign mutate x$4_@0.t[1:4] = read q$5_@1:TObject [4] Const mutate z$6:TObject = read x$4_@0.t [5] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.expect.md index 590a873875..2e5d4903f2 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.expect.md @@ -31,9 +31,6 @@ bb0: [7] Reassign mutate x$9_@2.t[4:8] = read o$8_@1:TObject [8] Const mutate y$11:TPoly = read x$9_@2.t [9] Return -scope2 [4:8]: - - dependency: read p$7_@0:TPrimitive - - dependency: read o$8_@1:TObject ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.expect.md index 2d42d0d159..d90abcedcb 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.expect.md @@ -16,7 +16,6 @@ bb0: [1] Const mutate x$3:TPrimitive = 1 [2] Const mutate y$4:TPrimitive = 2 [3] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.expect.md b/compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.expect.md index 225679a966..2b8cc718aa 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.expect.md @@ -30,7 +30,6 @@ bb1: predecessor blocks: bb2 bb0 [7] Const mutate z$12_@3:TPrimitive = Call mutate foo$2:TFunction() [8] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-break.expect.md b/compiler/forget/src/__tests__/fixtures/hir/while-break.expect.md index 1706389f1d..3c7c61ca88 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/while-break.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/while-break.expect.md @@ -22,7 +22,6 @@ bb1: bb2: predecessor blocks: bb1 [3] Return read b$4 - ``` ## Reactive Scopes diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.expect.md b/compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.expect.md index 15b3897253..7bd4f75fe4 100644 --- a/compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.expect.md +++ b/compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.expect.md @@ -37,7 +37,6 @@ bb2: predecessor blocks: bb1 [7] Call read d$8:TFunction() [8] Return - ``` ## Reactive Scopes diff --git a/compiler/forget/src/index.ts b/compiler/forget/src/index.ts index febd404e7c..d555f5e813 100644 --- a/compiler/forget/src/index.ts +++ b/compiler/forget/src/index.ts @@ -31,7 +31,6 @@ import { eliminateRedundantPhi } from "./HIR/EliminateRedundantPhi"; import enterSSA from "./HIR/EnterSSA"; import { Environment } from "./HIR/HIRBuilder"; import { inferMutableRanges } from "./HIR/InferMutableRanges"; -import { inferReactiveScopeDependencies } from "./HIR/InferReactiveScopeDependencies"; import { inferReactiveScopes } from "./HIR/InferReactiveScopes"; import { inferReactiveScopeVariables } from "./HIR/InferReactiveScopeVariables"; import inferReferenceEffects from "./HIR/InferReferenceEffects"; @@ -67,7 +66,6 @@ export const HIR = { enterSSA, inferMutableRanges, inferReferenceEffects, - inferReactiveScopeDependencies, inferReactiveScopeVariables, inferReactiveScopes, buildReactiveFunction,