From 5e51d767d179fda586f28e1118fb9ec5c200e35e Mon Sep 17 00:00:00 2001
From: Joe Savona <joesavona@fb.com>
Date: Wed, 28 Aug 2024 10:44:44 -0700
Subject: [PATCH] [compiler] Stop reusing ScopeDep type in AnalyzeFunctions

AnalyzeFunctions was reusing the `ReactiveScopeDependency` type since it happened to have a convenient shape, but we need to change this type to represent optionality. We now use a locally defined type instead.

ghstack-source-id: e305c6ede4bcbdffce606336c572cdc6dc1556c3
Pull Request resolved: https://github.com/facebook/react/pull/30811
---
 .../src/Inference/AnalyseFunctions.ts              | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/packages/babel-plugin-react-compiler/src/Inference/AnalyseFunctions.ts b/compiler/packages/babel-plugin-react-compiler/src/Inference/AnalyseFunctions.ts
index fbb24ea492c0f..684acaf298388 100644
--- a/compiler/packages/babel-plugin-react-compiler/src/Inference/AnalyseFunctions.ts
+++ b/compiler/packages/babel-plugin-react-compiler/src/Inference/AnalyseFunctions.ts
@@ -13,7 +13,6 @@ import {
   IdentifierName,
   LoweredFunction,
   Place,
-  ReactiveScopeDependency,
   isRefOrRefValue,
   makeInstructionId,
 } from '../HIR';
@@ -25,9 +24,14 @@ import {inferMutableContextVariables} from './InferMutableContextVariables';
 import {inferMutableRanges} from './InferMutableRanges';
 import inferReferenceEffects from './InferReferenceEffects';
 
+type Dependency = {
+  identifier: Identifier;
+  path: Array<string>;
+};
+
 // Helper class to track indirections such as LoadLocal and PropertyLoad.
 export class IdentifierState {
-  properties: Map<Identifier, ReactiveScopeDependency> = new Map();
+  properties: Map<Identifier, Dependency> = new Map();
 
   resolve(identifier: Identifier): Identifier {
     const resolved = this.properties.get(identifier);
@@ -39,7 +43,7 @@ export class IdentifierState {
 
   declareProperty(lvalue: Place, object: Place, property: string): void {
     const objectDependency = this.properties.get(object.identifier);
-    let nextDependency: ReactiveScopeDependency;
+    let nextDependency: Dependency;
     if (objectDependency === undefined) {
       nextDependency = {identifier: object.identifier, path: [property]};
     } else {
@@ -52,9 +56,7 @@ export class IdentifierState {
   }
 
   declareTemporary(lvalue: Place, value: Place): void {
-    const resolved: ReactiveScopeDependency = this.properties.get(
-      value.identifier,
-    ) ?? {
+    const resolved: Dependency = this.properties.get(value.identifier) ?? {
       identifier: value.identifier,
       path: [],
     };