Update

[ghstack-poisoned]

Author: mofeiZ

compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts

@@ -1492,6 +1492,7 @@ export type ReactiveScopeDeclaration = {
   scope: ReactiveScope; // the scope in which the variable was originally declared
 };
 
+export type DependencyPath = Array<{property: string; optional: boolean}>;
 export type ReactiveScopeDependency = {
   identifier: Identifier;
   path: DependencyPath;
@@ -1506,7 +1507,21 @@ export function areEqualPaths(a: DependencyPath, b: DependencyPath): boolean {
     )
   );
 }
-export type DependencyPath = Array<{property: string; optional: boolean}>;
+
+export function getPlaceScope(
+  id: InstructionId,
+  place: Place,
+): ReactiveScope | null {
+  const scope = place.identifier.scope;
+  if (scope !== null && isScopeActive(scope, id)) {
+    return scope;
+  }
+  return null;
+}
+
+function isScopeActive(scope: ReactiveScope, id: InstructionId): boolean {
+  return id >= scope.range.start && id < scope.range.end;
+}
 
 /*
  * Simulated opaque type for BlockIds to prevent using normal numbers as block ids

compiler/packages/babel-plugin-react-compiler/src/HIR/MergeOverlappingReactiveScopesHIR.ts

@@ -5,7 +5,7 @@ import {
   ReactiveScope,
   makeInstructionId,
 } from '.';
-import {getPlaceScope} from '../ReactiveScopes/BuildReactiveBlocks';
+import {getPlaceScope} from '../HIR/HIR';
 import {isMutable} from '../ReactiveScopes/InferReactiveScopeVariables';
 import DisjointSet from '../Utils/DisjointSet';
 import {getOrInsertDefault} from '../Utils/utils';

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/AlignReactiveScopesToBlockScopes.ts

@@ -13,6 +13,7 @@ import {
   MutableRange,
   Place,
   ReactiveScope,
+  getPlaceScope,
   makeInstructionId,
 } from '../HIR/HIR';
 import {
@@ -23,7 +24,6 @@ import {
   terminalFallthrough,
 } from '../HIR/visitors';
 import {retainWhere_Set} from '../Utils/utils';
-import {getPlaceScope} from './BuildReactiveBlocks';
 
 type InstructionRange = MutableRange;
 /*

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/AlignReactiveScopesToBlockScopesHIR.ts

@@ -14,7 +14,7 @@ import {
   ReactiveScopeBlock,
   ScopeId,
 } from '../HIR';
-import {getPlaceScope} from './BuildReactiveBlocks';
+import {getPlaceScope} from '../HIR/HIR';
 import {ReactiveFunctionVisitor} from './visitors';
 
 /*