From 0cc03352698c1c8e3f5e5fd0637710e28eb87ee6 Mon Sep 17 00:00:00 2001
From: arsyadal <116419335+arsyadal@users.noreply.github.com>
Date: Thu, 16 Apr 2026 09:53:33 +0700
Subject: [PATCH] Optimize property loads on destructured props

---
 .../src/Entrypoint/Pipeline.ts                |   4 +
 .../OptimizeDestructurePropertyLoads.ts       | 218 ++++++++++++++++++
 .../OptimizeDestructurePropertyLoads-test.ts  |  69 ++++++
 3 files changed, 291 insertions(+)
 create mode 100644 compiler/packages/babel-plugin-react-compiler/src/Optimization/OptimizeDestructurePropertyLoads.ts
 create mode 100644 compiler/packages/babel-plugin-react-compiler/src/__tests__/OptimizeDestructurePropertyLoads-test.ts

diff --git a/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts b/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts
index a0cd02817828..6be71ea6e62b 100644
--- a/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts
+++ b/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts
@@ -91,6 +91,7 @@ import {validateNoJSXInTryStatement} from '../Validation/ValidateNoJSXInTryState
 import {propagateScopeDependenciesHIR} from '../HIR/PropagateScopeDependenciesHIR';
 import {outlineJSX} from '../Optimization/OutlineJsx';
 import {optimizePropsMethodCalls} from '../Optimization/OptimizePropsMethodCalls';
+import {optimizeDestructurePropertyLoads} from '../Optimization/OptimizeDestructurePropertyLoads';
 import {validateStaticComponents} from '../Validation/ValidateStaticComponents';
 import {validateNoFreezingKnownMutableFunctions} from '../Validation/ValidateNoFreezingKnownMutableFunctions';
 import {inferMutationAliasingEffects} from '../Inference/InferMutationAliasingEffects';
@@ -207,6 +208,9 @@ function runWithEnvironment(
   optimizePropsMethodCalls(hir);
   log({kind: 'hir', name: 'OptimizePropsMethodCalls', value: hir});
 
+  optimizeDestructurePropertyLoads(hir);
+  log({kind: 'hir', name: 'OptimizeDestructurePropertyLoads', value: hir});
+
   analyseFunctions(hir);
   log({kind: 'hir', name: 'AnalyseFunctions', value: hir});
 
diff --git a/compiler/packages/babel-plugin-react-compiler/src/Optimization/OptimizeDestructurePropertyLoads.ts b/compiler/packages/babel-plugin-react-compiler/src/Optimization/OptimizeDestructurePropertyLoads.ts
new file mode 100644
index 000000000000..29fb66b4a848
--- /dev/null
+++ b/compiler/packages/babel-plugin-react-compiler/src/Optimization/OptimizeDestructurePropertyLoads.ts
@@ -0,0 +1,218 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import {
+  HIRFunction,
+  IdentifierId,
+  InstructionKind,
+  Place,
+  PropertyLiteral,
+  getHookKind,
+  makePropertyLiteral,
+} from '../HIR';
+import {eachInstructionValueOperand} from '../HIR/visitors';
+
+type RestObjectInfo = {
+  excludedProperties: Set<PropertyLiteral>;
+  source: Place;
+};
+
+/**
+ * Rewrites property loads on non-mutated object-rest temporaries back to the
+ * original frozen source when the loaded property was not excluded by the
+ * destructure.
+ *
+ * Example:
+ *
+ * ```
+ * // INPUT
+ * const {bar, ...rest} = props;
+ * return rest.foo;
+ *
+ * // OUTPUT
+ * return props.foo;
+ * ```
+ *
+ * This lets later passes derive a dependency on `props.foo` rather than the
+ * whole `props` object, and dead-code elimination can remove the now-unused
+ * object rest temporary.
+ */
+export function optimizeDestructurePropertyLoads(fn: HIRFunction): void {
+  const restObjects = findNonMutatedObjectRestObjects(fn);
+  if (restObjects.size === 0) {
+    return;
+  }
+
+  for (const block of fn.body.blocks.values()) {
+    for (const instr of block.instructions) {
+      if (instr.value.kind !== 'PropertyLoad') {
+        continue;
+      }
+
+      const restObject = restObjects.get(instr.value.object.identifier.id);
+      if (
+        restObject != null &&
+        !restObject.excludedProperties.has(instr.value.property)
+      ) {
+        instr.value = {
+          ...instr.value,
+          object: restObject.source,
+        };
+      }
+    }
+  }
+}
+
+function findNonMutatedObjectRestObjects(
+  fn: HIRFunction,
+): ReadonlyMap<IdentifierId, RestObjectInfo> {
+  const knownFrozen = new Set<IdentifierId>();
+  if (fn.fnType === 'Component') {
+    const [props] = fn.params;
+    if (props != null && props.kind === 'Identifier') {
+      knownFrozen.add(props.identifier.id);
+    }
+  } else {
+    for (const param of fn.params) {
+      if (param.kind === 'Identifier') {
+        knownFrozen.add(param.identifier.id);
+      }
+    }
+  }
+
+  const candidateRoots = new Map<IdentifierId, RestObjectInfo>();
+  const candidateAliases = new Map<IdentifierId, IdentifierId>();
+
+  const invalidateCandidate = (identifierId: IdentifierId): void => {
+    const rootId = candidateAliases.get(identifierId);
+    if (rootId != null) {
+      candidateRoots.delete(rootId);
+    }
+  };
+
+  for (const block of fn.body.blocks.values()) {
+    if (candidateRoots.size !== 0) {
+      for (const phi of block.phis) {
+        for (const operand of phi.operands.values()) {
+          invalidateCandidate(operand.identifier.id);
+        }
+      }
+    }
+
+    for (const instr of block.instructions) {
+      const {lvalue, value} = instr;
+      switch (value.kind) {
+        case 'Destructure': {
+          if (
+            !knownFrozen.has(value.value.identifier.id) ||
+            !(
+              value.lvalue.kind === InstructionKind.Let ||
+              value.lvalue.kind === InstructionKind.Const
+            ) ||
+            value.lvalue.pattern.kind !== 'ObjectPattern'
+          ) {
+            continue;
+          }
+
+          const excludedProperties = new Set<PropertyLiteral>();
+          let hasComputedProperty = false;
+          for (const property of value.lvalue.pattern.properties) {
+            if (property.kind === 'Spread') {
+              continue;
+            }
+            switch (property.key.kind) {
+              case 'computed': {
+                hasComputedProperty = true;
+                break;
+              }
+              case 'identifier':
+              case 'string':
+              case 'number': {
+                excludedProperties.add(makePropertyLiteral(property.key.name));
+                break;
+              }
+            }
+          }
+
+          if (hasComputedProperty) {
+            continue;
+          }
+
+          for (const property of value.lvalue.pattern.properties) {
+            if (property.kind !== 'Spread') {
+              continue;
+            }
+            candidateRoots.set(property.place.identifier.id, {
+              excludedProperties: new Set(excludedProperties),
+              source: value.value,
+            });
+            candidateAliases.set(
+              property.place.identifier.id,
+              property.place.identifier.id,
+            );
+          }
+          break;
+        }
+        case 'LoadLocal': {
+          if (knownFrozen.has(value.place.identifier.id)) {
+            knownFrozen.add(lvalue.identifier.id);
+          }
+
+          const rootId = candidateAliases.get(value.place.identifier.id);
+          if (rootId != null) {
+            candidateAliases.set(lvalue.identifier.id, rootId);
+          }
+          break;
+        }
+        case 'StoreLocal': {
+          if (knownFrozen.has(value.value.identifier.id)) {
+            knownFrozen.add(lvalue.identifier.id);
+            knownFrozen.add(value.lvalue.place.identifier.id);
+          }
+
+          const rootId = candidateAliases.get(value.value.identifier.id);
+          if (rootId != null) {
+            candidateAliases.set(lvalue.identifier.id, rootId);
+            candidateAliases.set(value.lvalue.place.identifier.id, rootId);
+          }
+          break;
+        }
+        case 'JsxFragment':
+        case 'JsxExpression':
+        case 'PropertyLoad': {
+          break;
+        }
+        case 'CallExpression':
+        case 'MethodCall': {
+          const callee =
+            value.kind === 'CallExpression' ? value.callee : value.property;
+          if (getHookKind(fn.env, callee.identifier) == null) {
+            for (const operand of eachInstructionValueOperand(value)) {
+              invalidateCandidate(operand.identifier.id);
+            }
+          }
+          break;
+        }
+        default: {
+          for (const operand of eachInstructionValueOperand(value)) {
+            invalidateCandidate(operand.identifier.id);
+          }
+          break;
+        }
+      }
+    }
+  }
+
+  const restObjects = new Map<IdentifierId, RestObjectInfo>();
+  for (const [identifierId, rootId] of candidateAliases) {
+    const restObject = candidateRoots.get(rootId);
+    if (restObject != null) {
+      restObjects.set(identifierId, restObject);
+    }
+  }
+  return restObjects;
+}
diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/OptimizeDestructurePropertyLoads-test.ts b/compiler/packages/babel-plugin-react-compiler/src/__tests__/OptimizeDestructurePropertyLoads-test.ts
new file mode 100644
index 000000000000..3280ed738c27
--- /dev/null
+++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/OptimizeDestructurePropertyLoads-test.ts
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as BabelParser from '@babel/parser';
+import {transformFromAstSync} from '@babel/core';
+import BabelPluginReactCompiler, {defaultOptions} from '..';
+
+function compile(input: string): string {
+  const ast = BabelParser.parse(input, {
+    sourceFilename: 'test.js',
+    plugins: ['typescript', 'jsx'],
+    sourceType: 'module',
+  });
+  const result = transformFromAstSync(ast, input, {
+    filename: 'test.js',
+    highlightCode: false,
+    retainLines: true,
+    compact: true,
+    plugins: [
+      [
+        BabelPluginReactCompiler,
+        {
+          ...defaultOptions,
+          compilationMode: 'all',
+          panicThreshold: 'all_errors',
+          enableReanimatedCheck: false,
+          logger: {logEvent() {}},
+          environment: {
+            ...defaultOptions.environment,
+            validatePreserveExistingMemoizationGuarantees: false,
+          },
+        },
+      ],
+    ],
+    sourceType: 'module',
+    ast: false,
+    cloneInputAst: false,
+    configFile: false,
+    babelrc: false,
+  });
+
+  expect(result?.code).toBeDefined();
+  return result!.code!;
+}
+
+describe('OptimizeDestructurePropertyLoads', () => {
+  it('rewrites non-excluded object rest property loads back to props', () => {
+    const output = compile(
+      'function Component(props) { const {bar, ...rest} = props; return <div>{rest.foo}</div>; }',
+    );
+
+    expect(output).toContain('!==props.foo');
+    expect(output).not.toContain('!==props){');
+    expect(output).not.toContain('rest.foo');
+  });
+
+  it('does not rewrite properties excluded by object rest destructuring', () => {
+    const output = compile(
+      'function Component(props) { const {foo, ...rest} = props; return <div>{rest.foo}</div>; }',
+    );
+
+    expect(output).toContain('!==props){');
+    expect(output).toContain('rest.foo');
+  });
+});