{"files":[{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/HIR.ts","status":"M"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/MergeOverlappingReactiveScopesHIR.ts","status":"M"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts","status":"D"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopesHIR.ts","status":"M"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AssertScopeInstructionsWithinScope.ts","status":"M"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/BuildReactiveBlocks.ts","status":"D"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenReactiveLoops.ts","status":"D"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenScopesWithHooksOrUse.ts","status":"D"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts","status":"D"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts","status":"M"},{"path":"compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/index.ts","status":"M"}],"body":"Followup to #30891\n\nghstack-source-id: 6b42055b5d28da39d99a235bcd86a82eb7c270f4\nPull Request resolved: https:\/\/github.com\/facebook\/react\/pull\/30892","patch":"diff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/HIR.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/HIR.ts\nindex 3a04a4c3c9..930dd79f2f 100644\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/HIR.ts\n+++ b\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/HIR.ts\n@@ -1492,6 +1492,7 @@ export type ReactiveScopeDeclaration = {\n scope: ReactiveScope; \/\/ the scope in which the variable was originally declared\n };\n \n+export type DependencyPath = Array<{property: string; optional: boolean}>;\n export type ReactiveScopeDependency = {\n identifier: Identifier;\n path: DependencyPath;\n@@ -1506,7 +1507,21 @@ export function areEqualPaths(a: DependencyPath, b: DependencyPath): boolean {\n )\n );\n }\n-export type DependencyPath = Array<{property: string; optional: boolean}>;\n+\n+export function getPlaceScope(\n+ id: InstructionId,\n+ place: Place,\n+): ReactiveScope | null {\n+ const scope = place.identifier.scope;\n+ if (scope !== null && isScopeActive(scope, id)) {\n+ return scope;\n+ }\n+ return null;\n+}\n+\n+function isScopeActive(scope: ReactiveScope, id: InstructionId): boolean {\n+ return id >= scope.range.start && id < scope.range.end;\n+}\n \n \/*\n * Simulated opaque type for BlockIds to prevent using normal numbers as block ids\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/MergeOverlappingReactiveScopesHIR.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/MergeOverlappingReactiveScopesHIR.ts\nindex 98645d5c54..a3740539b2 100644\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/MergeOverlappingReactiveScopesHIR.ts\n+++ b\/compiler\/packages\/babel-plugin-react-compiler\/src\/HIR\/MergeOverlappingReactiveScopesHIR.ts\n@@ -5,7 +5,7 @@ import {\n ReactiveScope,\n makeInstructionId,\n } from '.';\n-import {getPlaceScope} from '..\/ReactiveScopes\/BuildReactiveBlocks';\n+import {getPlaceScope} from '..\/HIR\/HIR';\n import {isMutable} from '..\/ReactiveScopes\/InferReactiveScopeVariables';\n import DisjointSet from '..\/Utils\/DisjointSet';\n import {getOrInsertDefault} from '..\/Utils\/utils';\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts\ndeleted file mode 100644\nindex 132788f0d4..0000000000\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts\n+++ \/dev\/null\n@@ -1,187 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-import {\n- InstructionId,\n- Place,\n- ReactiveBlock,\n- ReactiveFunction,\n- ReactiveInstruction,\n- ReactiveScope,\n- ScopeId,\n- makeInstructionId,\n-} from '..\/HIR\/HIR';\n-import {getPlaceScope} from '.\/BuildReactiveBlocks';\n-import {ReactiveFunctionVisitor, visitReactiveFunction} from '.\/visitors';\n-\n-\/*\n- * Note: this is the 2nd of 4 passes that determine how to break a function into discrete\n- * reactive scopes (independently memoizeable units of code):\n- * 1. InferReactiveScopeVariables (on HIR) determines operands that mutate together and assigns\n- * them a unique reactive scope.\n- * 2. AlignReactiveScopesToBlockScopes (this pass, on ReactiveFunction) aligns reactive scopes\n- * to block scopes.\n- * 3. MergeOverlappingReactiveScopes (on ReactiveFunction) ensures that reactive scopes do not\n- * overlap, merging any such scopes.\n- * 4. BuildReactiveBlocks (on ReactiveFunction) groups the statements for each scope into\n- * a ReactiveScopeBlock.\n- *\n- * Prior inference passes assign a reactive scope to each operand, but the ranges of these\n- * scopes are based on specific instructions at arbitrary points in the control-flow graph.\n- * However, to codegen blocks around the instructions in each scope, the scopes must be\n- * aligned to block-scope boundaries - we can't memoize half of a loop!\n- *\n- * This pass updates reactive scope boundaries to align to control flow boundaries, for\n- * example:\n- *\n- * ```javascript\n- * function foo(cond, a) {\n- * ⌵ original scope\n- * ⌵ expanded scope\n- * const x = []; ⌝ ⌝\n- * if (cond) { ⎮ ⎮\n- * ... ⎮ ⎮\n- * x.push(a); ⌟ ⎮\n- * ... ⎮\n- * } ⌟\n- * }\n- * ```\n- *\n- * Here the original scope for `x` ended partway through the if consequent, but we can't\n- * memoize part of that block. This pass would align the scope to the end of the consequent.\n- *\n- * The more general rule is that a reactive scope may only end at the same block scope as it\n- * began: this pass therefore finds, for each scope, the block where that scope started and\n- * finds the first instruction after the scope's mutable range in that same block scope (which\n- * will be the updated end for that scope).\n- *\/\n-\n-export function alignReactiveScopesToBlockScopes(fn: ReactiveFunction): void {\n- const context = new Context();\n- visitReactiveFunction(fn, new Visitor(), context);\n-}\n-\n-class Visitor extends ReactiveFunctionVisitor {\n- override visitID(id: InstructionId, state: Context): void {\n- state.visitId(id);\n- }\n- override visitPlace(id: InstructionId, place: Place, state: Context): void {\n- const scope = getPlaceScope(id, place);\n- if (scope !== null) {\n- state.visitScope(scope);\n- }\n- }\n- override visitLValue(id: InstructionId, lvalue: Place, state: Context): void {\n- const scope = getPlaceScope(id, lvalue);\n- if (scope !== null) {\n- state.visitScope(scope);\n- }\n- }\n-\n- override visitInstruction(instr: ReactiveInstruction, state: Context): void {\n- switch (instr.value.kind) {\n- case 'OptionalExpression':\n- case 'SequenceExpression':\n- case 'ConditionalExpression':\n- case 'LogicalExpression': {\n- const prevScopeCount = state.currentScopes().length;\n- this.traverseInstruction(instr, state);\n-\n- \/**\n- * These compound value types can have nested sequences of instructions\n- * with scopes that start \"partway\" through a block-level instruction.\n- * This would cause the start of the scope to not align with any block-level\n- * instruction and get skipped by the later BuildReactiveBlocks pass.\n- *\n- * Here we detect scopes created within compound instructions and align the\n- * start of these scopes to the outer instruction id to ensure the scopes\n- * aren't skipped.\n- *\/\n- const scopes = state.currentScopes();\n- for (let i = prevScopeCount; i < scopes.length; i++) {\n- const scope = scopes[i];\n- scope.scope.range.start = makeInstructionId(\n- Math.min(instr.id, scope.scope.range.start),\n- );\n- }\n- break;\n- }\n- default: {\n- this.traverseInstruction(instr, state);\n- }\n- }\n- }\n-\n- override visitBlock(block: ReactiveBlock, state: Context): void {\n- state.enter(() => {\n- this.traverseBlock(block, state);\n- });\n- }\n-}\n-\n-type PendingReactiveScope = {active: boolean; scope: ReactiveScope};\n-\n-class Context {\n- \/*\n- * For each block scope (outer array) stores a list of ReactiveScopes that start\n- * in that block scope.\n- *\/\n- #blockScopes: Array> = [];\n-\n- \/*\n- * ReactiveScopes whose declaring block scope has ended but may still need to\n- * be \"closed\" (ie have their range.end be updated). A given scope can be in\n- * blockScopes OR this array but not both.\n- *\/\n- #unclosedScopes: Array = [];\n-\n- \/*\n- * Set of all scope ids that have been seen so far, regardless of which of\n- * the above data structures they're in, to avoid tracking the same scope twice.\n- *\/\n- #seenScopes: Set = new Set();\n-\n- currentScopes(): Array {\n- return this.#blockScopes.at(-1) ?? [];\n- }\n-\n- enter(fn: () => void): void {\n- this.#blockScopes.push([]);\n- fn();\n- const lastScope = this.#blockScopes.pop()!;\n- for (const scope of lastScope) {\n- if (scope.active) {\n- this.#unclosedScopes.push(scope);\n- }\n- }\n- }\n-\n- visitId(id: InstructionId): void {\n- const currentScopes = this.#blockScopes.at(-1)!;\n- const scopes = [...currentScopes, ...this.#unclosedScopes];\n- for (const pending of scopes) {\n- if (!pending.active) {\n- continue;\n- }\n- if (id >= pending.scope.range.end) {\n- pending.active = false;\n- pending.scope.range.end = id;\n- }\n- }\n- }\n-\n- visitScope(scope: ReactiveScope): void {\n- if (!this.#seenScopes.has(scope.id)) {\n- const currentScopes = this.#blockScopes.at(-1)!;\n- this.#seenScopes.add(scope.id);\n- currentScopes.push({\n- active: true,\n- scope,\n- });\n- }\n- }\n-}\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopesHIR.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopesHIR.ts\nindex 3e8329679c..2b4e890a40 100644\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopesHIR.ts\n+++ b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopesHIR.ts\n@@ -13,6 +13,7 @@ import {\n MutableRange,\n Place,\n ReactiveScope,\n+ getPlaceScope,\n makeInstructionId,\n } from '..\/HIR\/HIR';\n import {\n@@ -23,7 +24,6 @@ import {\n terminalFallthrough,\n } from '..\/HIR\/visitors';\n import {retainWhere_Set} from '..\/Utils\/utils';\n-import {getPlaceScope} from '.\/BuildReactiveBlocks';\n \n type InstructionRange = MutableRange;\n \/*\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AssertScopeInstructionsWithinScope.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AssertScopeInstructionsWithinScope.ts\nindex 2bce100050..718e28f610 100644\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AssertScopeInstructionsWithinScope.ts\n+++ b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/AssertScopeInstructionsWithinScope.ts\n@@ -14,7 +14,7 @@ import {\n ReactiveScopeBlock,\n ScopeId,\n } from '..\/HIR';\n-import {getPlaceScope} from '.\/BuildReactiveBlocks';\n+import {getPlaceScope} from '..\/HIR\/HIR';\n import {ReactiveFunctionVisitor} from '.\/visitors';\n \n \/*\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/BuildReactiveBlocks.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/BuildReactiveBlocks.ts\ndeleted file mode 100644\nindex 7737423e5e..0000000000\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/BuildReactiveBlocks.ts\n+++ \/dev\/null\n@@ -1,244 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-import {CompilerError} from '..\/CompilerError';\n-import {\n- BlockId,\n- InstructionId,\n- Place,\n- ReactiveBlock,\n- ReactiveFunction,\n- ReactiveInstruction,\n- ReactiveScope,\n- ReactiveScopeBlock,\n- ReactiveStatement,\n- ScopeId,\n-} from '..\/HIR';\n-import {eachInstructionLValue} from '..\/HIR\/visitors';\n-import {assertExhaustive} from '..\/Utils\/utils';\n-import {eachReactiveValueOperand, mapTerminalBlocks} from '.\/visitors';\n-\n-\/*\n- * Note: this is the 4th of 4 passes that determine how to break a function into discrete\n- * reactive scopes (independently memoizeable units of code):\n- * 1. InferReactiveScopeVariables (on HIR) determines operands that mutate together and assigns\n- * them a unique reactive scope.\n- * 2. AlignReactiveScopesToBlockScopes (on ReactiveFunction) aligns reactive scopes\n- * to block scopes.\n- * 3. MergeOverlappingReactiveScopes (this pass, on ReactiveFunction) ensures that reactive\n- * scopes do not overlap, merging any such scopes.\n- * 4. BuildReactiveBlocks (on ReactiveFunction) groups the statements for each scope into\n- * a ReactiveScopeBlock.\n- *\n- * Given a function where the reactive scopes have been correctly aligned and merged,\n- * this pass groups the instructions for each reactive scope into ReactiveBlocks.\n- *\/\n-export function buildReactiveBlocks(fn: ReactiveFunction): void {\n- const context = new Context();\n- fn.body = context.enter(() => {\n- visitBlock(context, fn.body);\n- });\n-}\n-\n-class Context {\n- #builders: Array = [];\n- #scopes: Set = new Set();\n-\n- visitId(id: InstructionId): void {\n- const builder = this.#builders.at(-1)!;\n- builder.visitId(id);\n- }\n-\n- visitScope(scope: ReactiveScope): void {\n- if (this.#scopes.has(scope.id)) {\n- return;\n- }\n- this.#scopes.add(scope.id);\n- this.#builders.at(-1)!.startScope(scope);\n- }\n-\n- append(\n- stmt: ReactiveStatement,\n- label: {id: BlockId; implicit: boolean} | null,\n- ): void {\n- this.#builders.at(-1)!.append(stmt, label);\n- }\n-\n- enter(fn: () => void): ReactiveBlock {\n- const builder = new Builder();\n- this.#builders.push(builder);\n- fn();\n- const popped = this.#builders.pop();\n- CompilerError.invariant(popped === builder, {\n- reason: 'Expected push\/pop to be called 1:1',\n- description: null,\n- loc: null,\n- suggestions: null,\n- });\n- return builder.complete();\n- }\n-}\n-\n-class Builder {\n- #instructions: ReactiveBlock;\n- #stack: Array<\n- | {kind: 'scope'; block: ReactiveScopeBlock}\n- | {kind: 'block'; block: ReactiveBlock}\n- >;\n-\n- constructor() {\n- const block: ReactiveBlock = [];\n- this.#instructions = block;\n- this.#stack = [{kind: 'block', block}];\n- }\n-\n- append(\n- item: ReactiveStatement,\n- label: {id: BlockId; implicit: boolean} | null,\n- ): void {\n- if (label !== null) {\n- CompilerError.invariant(item.kind === 'terminal', {\n- reason: 'Only terminals may have a label',\n- description: null,\n- loc: null,\n- suggestions: null,\n- });\n- item.label = label;\n- }\n- this.#instructions.push(item);\n- }\n-\n- startScope(scope: ReactiveScope): void {\n- const block: ReactiveScopeBlock = {\n- kind: 'scope',\n- scope,\n- instructions: [],\n- };\n- this.append(block, null);\n- this.#instructions = block.instructions;\n- this.#stack.push({kind: 'scope', block});\n- }\n-\n- visitId(id: InstructionId): void {\n- for (let i = 0; i < this.#stack.length; i++) {\n- const entry = this.#stack[i]!;\n- if (entry.kind === 'scope' && id >= entry.block.scope.range.end) {\n- this.#stack.length = i;\n- break;\n- }\n- }\n- const last = this.#stack[this.#stack.length - 1]!;\n- if (last.kind === 'block') {\n- this.#instructions = last.block;\n- } else {\n- this.#instructions = last.block.instructions;\n- }\n- }\n-\n- complete(): ReactiveBlock {\n- \/*\n- * TODO: @josephsavona debug violations of this invariant\n- * invariant(\n- * this.#stack.length === 1,\n- * \"Expected all scopes to be closed when exiting a block\"\n- * );\n- *\/\n- const first = this.#stack[0]!;\n- CompilerError.invariant(first.kind === 'block', {\n- reason: 'Expected first stack item to be a basic block',\n- description: null,\n- loc: null,\n- suggestions: null,\n- });\n- return first.block;\n- }\n-}\n-\n-function visitBlock(context: Context, block: ReactiveBlock): void {\n- for (const stmt of block) {\n- switch (stmt.kind) {\n- case 'instruction': {\n- context.visitId(stmt.instruction.id);\n- const scope = getInstructionScope(stmt.instruction);\n- if (scope !== null) {\n- context.visitScope(scope);\n- }\n- context.append(stmt, null);\n- break;\n- }\n- case 'terminal': {\n- const id = stmt.terminal.id;\n- if (id !== null) {\n- context.visitId(id);\n- }\n- mapTerminalBlocks(stmt.terminal, block => {\n- return context.enter(() => {\n- visitBlock(context, block);\n- });\n- });\n- context.append(stmt, stmt.label);\n- break;\n- }\n- case 'pruned-scope':\n- case 'scope': {\n- CompilerError.invariant(false, {\n- reason: 'Expected the function to not have scopes already assigned',\n- description: null,\n- loc: null,\n- suggestions: null,\n- });\n- }\n- default: {\n- assertExhaustive(\n- stmt,\n- `Unexpected statement kind \\`${(stmt as any).kind}\\``,\n- );\n- }\n- }\n- }\n-}\n-\n-export function getInstructionScope(\n- instr: ReactiveInstruction,\n-): ReactiveScope | null {\n- CompilerError.invariant(instr.lvalue !== null, {\n- reason:\n- 'Expected lvalues to not be null when assigning scopes. ' +\n- 'Pruning lvalues too early can result in missing scope information.',\n- description: null,\n- loc: instr.loc,\n- suggestions: null,\n- });\n- for (const operand of eachInstructionLValue(instr)) {\n- const operandScope = getPlaceScope(instr.id, operand);\n- if (operandScope !== null) {\n- return operandScope;\n- }\n- }\n- for (const operand of eachReactiveValueOperand(instr.value)) {\n- const operandScope = getPlaceScope(instr.id, operand);\n- if (operandScope !== null) {\n- return operandScope;\n- }\n- }\n- return null;\n-}\n-\n-export function getPlaceScope(\n- id: InstructionId,\n- place: Place,\n-): ReactiveScope | null {\n- const scope = place.identifier.scope;\n- if (scope !== null && isScopeActive(scope, id)) {\n- return scope;\n- }\n- return null;\n-}\n-\n-function isScopeActive(scope: ReactiveScope, id: InstructionId): boolean {\n- return id >= scope.range.start && id < scope.range.end;\n-}\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenReactiveLoops.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenReactiveLoops.ts\ndeleted file mode 100644\nindex 2119b8c167..0000000000\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenReactiveLoops.ts\n+++ \/dev\/null\n@@ -1,84 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-import {\n- ReactiveFunction,\n- ReactiveScopeBlock,\n- ReactiveStatement,\n- ReactiveTerminal,\n- ReactiveTerminalStatement,\n-} from '..\/HIR\/HIR';\n-import {assertExhaustive} from '..\/Utils\/utils';\n-import {\n- ReactiveFunctionTransform,\n- Transformed,\n- visitReactiveFunction,\n-} from '.\/visitors';\n-\n-\/*\n- * Given a reactive function, flattens any scopes contained within a loop construct.\n- * We won't initially support memoization within loops though this is possible in the future.\n- *\/\n-export function flattenReactiveLoops(fn: ReactiveFunction): void {\n- visitReactiveFunction(fn, new Transform(), false);\n-}\n-\n-class Transform extends ReactiveFunctionTransform {\n- override transformScope(\n- scope: ReactiveScopeBlock,\n- isWithinLoop: boolean,\n- ): Transformed {\n- this.visitScope(scope, isWithinLoop);\n- if (isWithinLoop) {\n- return {\n- kind: 'replace',\n- value: {\n- kind: 'pruned-scope',\n- scope: scope.scope,\n- instructions: scope.instructions,\n- },\n- };\n- } else {\n- return {kind: 'keep'};\n- }\n- }\n-\n- override visitTerminal(\n- stmt: ReactiveTerminalStatement,\n- isWithinLoop: boolean,\n- ): void {\n- switch (stmt.terminal.kind) {\n- \/\/ Loop terminals flatten nested scopes\n- case 'do-while':\n- case 'while':\n- case 'for':\n- case 'for-of':\n- case 'for-in': {\n- this.traverseTerminal(stmt, true);\n- break;\n- }\n- \/\/ Non-loop terminals passthrough is contextual, inherits the parent isWithinScope\n- case 'try':\n- case 'label':\n- case 'break':\n- case 'continue':\n- case 'if':\n- case 'return':\n- case 'switch':\n- case 'throw': {\n- this.traverseTerminal(stmt, isWithinLoop);\n- break;\n- }\n- default: {\n- assertExhaustive(\n- stmt.terminal,\n- `Unexpected terminal kind \\`${(stmt.terminal as any).kind}\\``,\n- );\n- }\n- }\n- }\n-}\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenScopesWithHooksOrUse.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenScopesWithHooksOrUse.ts\ndeleted file mode 100644\nindex 753cd3d6e8..0000000000\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/FlattenScopesWithHooksOrUse.ts\n+++ \/dev\/null\n@@ -1,123 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-import {\n- Environment,\n- InstructionId,\n- ReactiveFunction,\n- ReactiveScopeBlock,\n- ReactiveStatement,\n- ReactiveValue,\n- getHookKind,\n- isUseOperator,\n-} from '..\/HIR';\n-import {\n- ReactiveFunctionTransform,\n- Transformed,\n- visitReactiveFunction,\n-} from '.\/visitors';\n-\n-\/**\n- * For simplicity the majority of compiler passes do not treat hooks specially. However, hooks are different\n- * from regular functions in two key ways:\n- * - They can introduce reactivity even when their arguments are non-reactive (accounted for in InferReactivePlaces)\n- * - They cannot be called conditionally\n- *\n- * The `use` operator is similar:\n- * - It can access context, and therefore introduce reactivity\n- * - It can be called conditionally, but _it must be called if the component needs the return value_. This is because\n- * React uses the fact that use was called to remember that the component needs the value, and that changes to the\n- * input should invalidate the component itself.\n- *\n- * This pass accounts for the \"can't call conditionally\" aspect of both hooks and use. Though the reasoning is slightly\n- * different for reach, the result is that we can't memoize scopes that call hooks or use since this would make them\n- * called conditionally in the output.\n- *\n- * The pass finds and removes any scopes that transitively contain a hook or use call. By running all\n- * the reactive scope inference first, agnostic of hooks, we know that the reactive scopes accurately\n- * describe the set of values which \"construct together\", and remove _all_ that memoization in order\n- * to ensure the hook call does not inadvertently become conditional.\n- *\/\n-export function flattenScopesWithHooksOrUse(fn: ReactiveFunction): void {\n- visitReactiveFunction(fn, new Transform(), {\n- env: fn.env,\n- hasHook: false,\n- });\n-}\n-\n-type State = {\n- env: Environment;\n- hasHook: boolean;\n-};\n-\n-class Transform extends ReactiveFunctionTransform {\n- override transformScope(\n- scope: ReactiveScopeBlock,\n- outerState: State,\n- ): Transformed {\n- const innerState: State = {\n- env: outerState.env,\n- hasHook: false,\n- };\n- this.visitScope(scope, innerState);\n- outerState.hasHook ||= innerState.hasHook;\n- if (innerState.hasHook) {\n- if (scope.instructions.length === 1) {\n- \/*\n- * This was a scope just for a hook call, which doesn't need memoization.\n- * flatten it away\n- *\/\n- return {\n- kind: 'replace-many',\n- value: scope.instructions,\n- };\n- }\n- \/*\n- * else this scope had multiple instructions and produced some other value:\n- * mark it as pruned\n- *\/\n- return {\n- kind: 'replace',\n- value: {\n- kind: 'pruned-scope',\n- scope: scope.scope,\n- instructions: scope.instructions,\n- },\n- };\n- } else {\n- return {kind: 'keep'};\n- }\n- }\n-\n- override visitValue(\n- id: InstructionId,\n- value: ReactiveValue,\n- state: State,\n- ): void {\n- this.traverseValue(id, value, state);\n- switch (value.kind) {\n- case 'CallExpression': {\n- if (\n- getHookKind(state.env, value.callee.identifier) != null ||\n- isUseOperator(value.callee.identifier)\n- ) {\n- state.hasHook = true;\n- }\n- break;\n- }\n- case 'MethodCall': {\n- if (\n- getHookKind(state.env, value.property.identifier) != null ||\n- isUseOperator(value.property.identifier)\n- ) {\n- state.hasHook = true;\n- }\n- break;\n- }\n- }\n- }\n-}\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts\ndeleted file mode 100644\nindex 733730fdec..0000000000\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts\n+++ \/dev\/null\n@@ -1,281 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-import {\n- InstructionId,\n- makeInstructionId,\n- Place,\n- ReactiveBlock,\n- ReactiveFunction,\n- ReactiveInstruction,\n- ReactiveScope,\n- ScopeId,\n-} from '..\/HIR';\n-import DisjointSet from '..\/Utils\/DisjointSet';\n-import {retainWhere} from '..\/Utils\/utils';\n-import {getPlaceScope} from '.\/BuildReactiveBlocks';\n-import {ReactiveFunctionVisitor, visitReactiveFunction} from '.\/visitors';\n-\n-\/*\n- * Note: this is the 3rd of 4 passes that determine how to break a function into discrete\n- * reactive scopes (independently memoizeable units of code):\n- * 1. InferReactiveScopeVariables (on HIR) determines operands that mutate together and assigns\n- * them a unique reactive scope.\n- * 2. AlignReactiveScopesToBlockScopes (on ReactiveFunction) aligns reactive scopes\n- * to block scopes.\n- * 3. MergeOverlappingReactiveScopes (this pass, on ReactiveFunction) ensures that reactive\n- * scopes do not overlap, merging any such scopes.\n- * 4. BuildReactiveBlocks (on ReactiveFunction) groups the statements for each scope into\n- * a ReactiveScopeBlock.\n- *\n- * Previous passes may leave \"overlapping\" scopes, ie where one or more instructions are within\n- * the mutable range of multiple reactive scopes. We prefer to avoid executing instructions twice\n- * for performance reasons (side effects are less of a concern bc components are required to be\n- * idempotent), so we cannot simply repeat the instruction once for each scope. Instead, the only\n- * option is to combine the two scopes into one. This is an area where an eventual Forget IDE\n- * could provide real-time feedback to the developer that two computations are accidentally merged.\n- *\n- * ## Detailed Walkthrough\n- *\n- * Two scopes overlap if there is one or more instruction that is inside the range\n- * of both scopes. In general, overlapping scopes are merged togther. The only\n- * exception to this is when one scope *shadows* another scope. For example:\n- *\n- * ```javascript\n- * function foo(cond, a) {\n- * ⌵ scope for x\n- * let x = []; ⌝\n- * if (cond) { ⎮\n- * ⌵ scope for y ⎮\n- * let y = []; ⌝ ⎮\n- * if (b) { ⎮ ⎮\n- * y.push(b); ⌟ ⎮\n- * } ⎮\n- * x.push(

{y}<\/div>); ⎮\n- * } ⌟\n- * }\n- * ```\n- *\n- * In this example the two scopes overlap, but mutation of the two scopes is not\n- * interleaved. Specifically within the y scope there are no instructions that\n- * modify any other scope: the inner scope \"shadows\" the outer one. This category\n- * of overlap does *NOT* merge the scopes together.\n- *\n- * The implementation is inspired by the Rust notion of \"stacked borrows\". We traverse\n- * the control-flow graph in tree form, at each point keeping track of which scopes are\n- * active. So initially we see\n- *\n- * `let x = []`\n- * active scopes: [x]\n- *\n- * and mark the x scope as active.\n- *\n- * Then we later encounter\n- *\n- * `let y = [];`\n- * active scopes: [x, y]\n- *\n- * Here we first check to see if 'y' is already in the list of active scopes. It isn't,\n- * so we push it to the stop of the stack.\n- *\n- * Then\n- *\n- * `y.push(b)`\n- * active scopes: [x, y]\n- *\n- * Mutates y, so we check if y is the top of the stack. It is, so no merging must occur.\n- *\n- * If instead we saw eg\n- *\n- * `x.push(b)`\n- * active scopes: [x, y]\n- *\n- * Then we would see that 'x' is active, but that it is shadowed. The two scopes would have\n- * to be merged.\n- *\/\n-export function mergeOverlappingReactiveScopes(fn: ReactiveFunction): void {\n- const context = new Context();\n- visitReactiveFunction(fn, new Visitor(), context);\n- context.complete();\n-}\n-\n-class Visitor extends ReactiveFunctionVisitor {\n- override visitID(id: InstructionId, state: Context): void {\n- state.visitId(id);\n- }\n- override visitPlace(id: InstructionId, place: Place, state: Context): void {\n- state.visitPlace(id, place);\n- }\n- override visitLValue(id: InstructionId, lvalue: Place, state: Context): void {\n- state.visitPlace(id, lvalue);\n- }\n- override visitBlock(block: ReactiveBlock, state: Context): void {\n- state.enter(() => {\n- this.traverseBlock(block, state);\n- });\n- }\n- override visitInstruction(\n- instruction: ReactiveInstruction,\n- state: Context,\n- ): void {\n- if (\n- instruction.value.kind === 'ConditionalExpression' ||\n- instruction.value.kind === 'LogicalExpression' ||\n- instruction.value.kind === 'OptionalExpression'\n- ) {\n- state.enter(() => {\n- super.visitInstruction(instruction, state);\n- });\n- } else {\n- super.visitInstruction(instruction, state);\n- }\n- }\n-}\n-\n-class BlockScope {\n- seen: Set = new Set();\n- scopes: Array = [];\n-}\n-\n-type ShadowableReactiveScope = {\n- scope: ReactiveScope;\n- shadowedBy: ReactiveScope | null;\n-};\n-\n-class Context {\n- scopes: Array = [];\n- seenScopes: Set = new Set();\n- joinedScopes: DisjointSet = new DisjointSet();\n- operandScopes: Map = new Map();\n-\n- visitId(id: InstructionId): void {\n- const currentBlock = this.scopes[this.scopes.length - 1]!;\n- retainWhere(currentBlock.scopes, pending => {\n- if (pending.scope.range.end > id) {\n- return true;\n- } else {\n- currentBlock.seen.delete(pending.scope.id);\n- return false;\n- }\n- });\n- }\n-\n- visitPlace(id: InstructionId, place: Place): void {\n- const scope = getPlaceScope(id, place);\n- if (scope === null) {\n- return;\n- }\n- this.operandScopes.set(place, scope);\n- const currentBlock = this.scopes[this.scopes.length - 1]!;\n- \/\/ Fast-path for the first time we see a new scope\n- if (!this.seenScopes.has(scope.id)) {\n- this.seenScopes.add(scope.id);\n- currentBlock.seen.add(scope.id);\n- currentBlock.scopes.push({shadowedBy: null, scope});\n- return;\n- }\n- \/\/ Scope has already been seen, find it in the current block or a parent\n- let index = this.scopes.length - 1;\n- let nextBlock = currentBlock;\n- while (!nextBlock.seen.has(scope.id)) {\n- \/*\n- * scopes that cross control-flow boundaries are merged with overlapping\n- * scopes\n- *\/\n- this.joinedScopes.union([scope, ...nextBlock.scopes.map(s => s.scope)]);\n- index--;\n- if (index < 0) {\n- \/*\n- * TODO: handle reassignments in multiple branches. these create new identifiers that\n- * add an entry to this.seenScopes but which are then removed when their blocks exit.\n- * this is also wrong for codegen, different versions of an identifier could be cached\n- * differently and so a reassigned version of a variable needs a separate declaration.\n- * console.log(`scope ${scope.id} not found`);\n- *\/\n-\n- \/*\n- * for (let i = this.scopes.length - 1; i > index; i--) {\n- * const s = this.scopes[i];\n- * console.log(\n- * JSON.stringify(\n- * {\n- * seen: Array.from(s.seen),\n- * scopes: s.scopes,\n- * },\n- * null,\n- * 2\n- * )\n- * );\n- * }\n- *\/\n- currentBlock.seen.add(scope.id);\n- currentBlock.scopes.push({shadowedBy: null, scope});\n- return;\n- }\n- nextBlock = this.scopes[index]!;\n- }\n-\n- \/\/ Handle interleaving within a given block scope\n- let found = false;\n- for (let i = 0; i < nextBlock.scopes.length; i++) {\n- const current = nextBlock.scopes[i]!;\n- if (current.scope.id === scope.id) {\n- found = true;\n- if (current.shadowedBy !== null) {\n- this.joinedScopes.union([current.shadowedBy, current.scope]);\n- }\n- } else if (found && current.shadowedBy === null) {\n- \/\/ `scope` is shadowing `current` and may interleave\n- current.shadowedBy = scope;\n- if (current.scope.range.end > scope.range.end) {\n- \/*\n- * Current is shadowed by `scope`, and we know that `current` will mutate\n- * again (per its range), so the scopes are already known to interleave.\n- *\n- * Eagerly extend the ranges of the scopes so that we don't prematurely end\n- * a scope relative to its eventual post-merge mutable range\n- *\/\n- const end = makeInstructionId(\n- Math.max(current.scope.range.end, scope.range.end),\n- );\n- current.scope.range.end = end;\n- scope.range.end = end;\n- this.joinedScopes.union([current.scope, scope]);\n- }\n- }\n- }\n- if (!currentBlock.seen.has(scope.id)) {\n- currentBlock.seen.add(scope.id);\n- currentBlock.scopes.push({shadowedBy: null, scope});\n- }\n- }\n-\n- enter(fn: () => void): void {\n- this.scopes.push(new BlockScope());\n- fn();\n- this.scopes.pop();\n- }\n-\n- complete(): void {\n- this.joinedScopes.forEach((scope, groupScope) => {\n- if (scope !== groupScope) {\n- groupScope.range.start = makeInstructionId(\n- Math.min(groupScope.range.start, scope.range.start),\n- );\n- groupScope.range.end = makeInstructionId(\n- Math.max(groupScope.range.end, scope.range.end),\n- );\n- }\n- });\n- for (const [operand, originalScope] of this.operandScopes) {\n- const mergedScope = this.joinedScopes.find(originalScope);\n- if (mergedScope !== null) {\n- operand.identifier.scope = mergedScope;\n- }\n- }\n- }\n-}\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\nindex 8033d05e2b..5a9aa6b2a7 100644\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\n+++ b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\n@@ -26,7 +26,7 @@ import {\n } from '..\/HIR';\n import {getFunctionCallSignature} from '..\/Inference\/InferReferenceEffects';\n import {assertExhaustive, getOrInsertDefault} from '..\/Utils\/utils';\n-import {getPlaceScope} from '.\/BuildReactiveBlocks';\n+import {getPlaceScope} from '..\/HIR\/HIR';\n import {\n ReactiveFunctionTransform,\n ReactiveFunctionVisitor,\ndiff --git a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/index.ts b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/index.ts\nindex 55f67fc2f7..eb77830561 100644\n--- a\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/index.ts\n+++ b\/compiler\/packages\/babel-plugin-react-compiler\/src\/ReactiveScopes\/index.ts\n@@ -6,18 +6,13 @@\n *\/\n \n export {alignObjectMethodScopes} from '.\/AlignObjectMethodScopes';\n-export {alignReactiveScopesToBlockScopes} from '.\/AlignReactiveScopesToBlockScopes';\n export {assertScopeInstructionsWithinScopes} from '.\/AssertScopeInstructionsWithinScope';\n export {assertWellFormedBreakTargets} from '.\/AssertWellFormedBreakTargets';\n-export {buildReactiveBlocks} from '.\/BuildReactiveBlocks';\n export {buildReactiveFunction} from '.\/BuildReactiveFunction';\n export {codegenFunction, type CodegenFunction} from '.\/CodegenReactiveFunction';\n export {extractScopeDeclarationsFromDestructuring} from '.\/ExtractScopeDeclarationsFromDestructuring';\n-export {flattenReactiveLoops} from '.\/FlattenReactiveLoops';\n-export {flattenScopesWithHooksOrUse} from '.\/FlattenScopesWithHooksOrUse';\n export {inferReactiveScopeVariables} from '.\/InferReactiveScopeVariables';\n export {memoizeFbtAndMacroOperandsInSameScope} from '.\/MemoizeFbtAndMacroOperandsInSameScope';\n-export {mergeOverlappingReactiveScopes} from '.\/MergeOverlappingReactiveScopes';\n export {mergeReactiveScopesThatInvalidateTogether} from '.\/MergeReactiveScopesThatInvalidateTogether';\n export {printReactiveFunction} from '.\/PrintReactiveFunction';\n export {promoteUsedTemporaries} from '.\/PromoteUsedTemporaries';\n","parents":["43264a61d06e0f653beb7882aaad1005e0797855"],"commit":{"authoredAt":"2024-09-05T20:14:34-04:00","shortRevision":"7b98a168fd","authorName":"Mofei Zhang","authorEmail":"mofei.zhang@utexas.edu","revision":"7b98a168fdebb57b3a0b965cb0b5efa16c9cf9e0","subject":"[compiler][cleanup] Delete now-unused reactive scope fork"}}

dillon1000/react

Files changed