Skip to content

[compiler] Name anonymous functions from inlined useCallbacks #34586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2025
+60 −33
Merged

[compiler] Name anonymous functions from inlined useCallbacks #34586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions compiler/packages/babel-plugin-react-compiler/src/Transform/NameAnonymousFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function nameAnonymousFunctions(fn: HIRFunction): void {
const parentName = fn.id;
const functions = nameAnonymousFunctionsImpl(fn);
function visit(node: Node, prefix: string): void {
if (node.generatedName != null) {
if (node.generatedName != null && node.fn.nameHint == null) {
/**
* Note that we don't generate a name for functions that already had one,
* so we'll only add the prefix to anonymous functions regardless of
Expand Down Expand Up @@ -70,6 +70,10 @@ function nameAnonymousFunctionsImpl(fn: HIRFunction): Array<Node> {
if (name != null && name.kind === 'named') {
names.set(lvalue.identifier.id, name.value);
}
const func = functions.get(value.place.identifier.id);
if (func != null) {
functions.set(lvalue.identifier.id, func);
}
break;
}
case 'PropertyLoad': {
Expand Down Expand Up @@ -106,6 +110,7 @@ function nameAnonymousFunctionsImpl(fn: HIRFunction): Array<Node> {
const variableName = value.lvalue.place.identifier.name;
if (
node != null &&
node.generatedName == null &&
variableName != null &&
variableName.kind === 'named'
) {
Expand Down Expand Up @@ -137,7 +142,7 @@ function nameAnonymousFunctionsImpl(fn: HIRFunction): Array<Node> {
continue;
}
const node = functions.get(arg.identifier.id);
if (node != null) {
if (node != null && node.generatedName == null) {
const generatedName =
fnArgCount > 1 ? `${calleeName}(arg${i})` : `${calleeName}()`;
node.generatedName = generatedName;
Expand All @@ -152,7 +157,7 @@ function nameAnonymousFunctionsImpl(fn: HIRFunction): Array<Node> {
continue;
}
const node = functions.get(attr.place.identifier.id);
if (node != null) {
if (node != null && node.generatedName == null) {
const elementName =
value.tag.kind === 'BuiltinTag'
? value.tag.name
Expand Down
73 changes: 45 additions & 28 deletions ...act-compiler/src/__tests__/fixtures/compiler/name-anonymous-functions.expect.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
```javascript
// @enableNameAnonymousFunctions

import {useEffect} from 'react';
import {useCallback, useEffect} from 'react';
import {identity, Stringify, useIdentity} from 'shared-runtime';
import * as SharedRuntime from 'shared-runtime';

function Component(props) {
function named() {
const inner = () => props.named;
return inner();
const innerIdentity = identity(() => props.named);
return inner(innerIdentity());
}
const callback = useCallback(() => {
return 'ok';
}, []);
const namedVariable = function () {
return props.namedVariable;
};
Expand All @@ -30,6 +34,7 @@ function Component(props) {
return (
<>
{named()}
{callback()}
{namedVariable()}
{methodCall()}
{call()}
Expand Down Expand Up @@ -63,7 +68,7 @@ export const TODO_FIXTURE_ENTRYPOINT = {
```javascript
import { c as _c } from "react/compiler-runtime"; // @enableNameAnonymousFunctions

import { useEffect } from "react";
import { useCallback, useEffect } from "react";
import { identity, Stringify, useIdentity } from "shared-runtime";
import * as SharedRuntime from "shared-runtime";

Expand All @@ -75,14 +80,21 @@ function Component(props) {
const inner = { "Component[named > inner]": () => props.named }[
"Component[named > inner]"
];
return inner();
const innerIdentity = identity(
{ "Component[named > identity()]": () => props.named }[
"Component[named > identity()]"
],
);
return inner(innerIdentity());
};
$[0] = props.named;
$[1] = t0;
} else {
t0 = $[1];
}
const named = t0;

const callback = _ComponentCallback;
let t1;
if ($[2] !== props.namedVariable) {
t1 = {
Expand Down Expand Up @@ -197,57 +209,62 @@ function Component(props) {
} else {
t9 = $[18];
}
let t10;
const t10 = callback();
let t11;
if ($[19] !== namedVariable) {
t10 = namedVariable();
t11 = namedVariable();
$[19] = namedVariable;
$[20] = t10;
$[20] = t11;
} else {
t10 = $[20];
t11 = $[20];
}
const t11 = methodCall();
const t12 = call();
let t13;
const t12 = methodCall();
const t13 = call();
let t14;
if ($[21] !== hookArgument) {
t13 = hookArgument();
t14 = hookArgument();
$[21] = hookArgument;
$[22] = t13;
$[22] = t14;
} else {
t13 = $[22];
t14 = $[22];
}
let t14;
let t15;
if (
$[23] !== builtinElementAttr ||
$[24] !== namedElementAttr ||
$[25] !== t10 ||
$[26] !== t11 ||
$[27] !== t12 ||
$[28] !== t13 ||
$[25] !== t11 ||
$[26] !== t12 ||
$[27] !== t13 ||
$[28] !== t14 ||
$[29] !== t9
) {
t14 = (
t15 = (
<>
{t9}
{t10}
{t11}
{t12}
{t13}
{builtinElementAttr}
{namedElementAttr}
{t13}
{t14}
</>
);
$[23] = builtinElementAttr;
$[24] = namedElementAttr;
$[25] = t10;
$[26] = t11;
$[27] = t12;
$[28] = t13;
$[25] = t11;
$[26] = t12;
$[27] = t13;
$[28] = t14;
$[29] = t9;
$[30] = t14;
$[30] = t15;
} else {
t14 = $[30];
t15 = $[30];
}
return t14;
return t15;
}
function _ComponentCallback() {
return "ok";
Comment on lines +266 to +267
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

}

export const TODO_FIXTURE_ENTRYPOINT = {
Expand Down
9 changes: 7 additions & 2 deletions ...s/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/name-anonymous-functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
// @enableNameAnonymousFunctions

import {useEffect} from 'react';
import {useCallback, useEffect} from 'react';
import {identity, Stringify, useIdentity} from 'shared-runtime';
import * as SharedRuntime from 'shared-runtime';

function Component(props) {
function named() {
const inner = () => props.named;
return inner();
const innerIdentity = identity(() => props.named);
return inner(innerIdentity());
}
const callback = useCallback(() => {
return 'ok';
}, []);
const namedVariable = function () {
return props.namedVariable;
};
Expand All @@ -26,6 +30,7 @@ function Component(props) {
return (
<>
{named()}
{callback()}
{namedVariable()}
{methodCall()}
{call()}
Expand Down
Loading