Skip to content
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

Jump to bottom

[compiled] Refactor codegen for ReactiveFunction #30087

Closed
wants to merge 2 commits into from
Closed

[compiled] Refactor codegen for ReactiveFunction #30087

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b63e5f3
[compiled] Refactor codegen for ReactiveFunction
gsathya Jun 25, 2024
2f54bc3
Update on "[compiled] Refactor codegen for ReactiveFunction"
gsathya Jun 25, 2024
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
79 changes: 46 additions & 33 deletions compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
ArrayPattern,
BlockId,
GeneratedSource,
HIRFunction,
Identifier,
IdentifierId,
InstructionKind,
Expand Down Expand Up @@ -1933,39 +1934,12 @@ function codegenInstructionValue(
break;
}
case "FunctionExpression": {
const loweredFunc = instrValue.loweredFunc.func;
const reactiveFunction = buildReactiveFunction(loweredFunc);
pruneUnusedLabels(reactiveFunction);
pruneUnusedLValues(reactiveFunction);
pruneHoistedContexts(reactiveFunction);
const fn = codegenReactiveFunction(
new Context(
cx.env,
reactiveFunction.id ?? "[[ anonymous ]]",
cx.uniqueIdentifiers,
cx.temp
),
reactiveFunction
).unwrap();
if (instrValue.expr.type === "ArrowFunctionExpression") {
let body: t.BlockStatement | t.Expression = fn.body;
if (body.body.length === 1 && loweredFunc.directives.length == 0) {
const stmt = body.body[0]!;
if (stmt.type === "ReturnStatement" && stmt.argument != null) {
body = stmt.argument;
}
}
value = t.arrowFunctionExpression(fn.params, body, fn.async);
} else {
value = t.functionExpression(
fn.id ??
(instrValue.name != null ? t.identifier(instrValue.name) : null),
fn.params,
fn.body,
fn.generator,
fn.async
);
}
value = codegenloweredFunc(
cx,
instrValue.loweredFunc.func,
instrValue.expr.type,
instrValue.name
);
break;
}
case "TaggedTemplateExpression": {
Expand Down Expand Up @@ -2171,6 +2145,45 @@ function codegenInstructionValue(
*/
const STRING_REQUIRES_EXPR_CONTAINER_PATTERN =
/[\u{0000}-\u{001F}|\u{007F}|\u{0080}-\u{FFFF}]|"/u;

function codegenloweredFunc(
cx: Context,
loweredFunc: HIRFunction,
fnType: string,
name: string | null
): t.FunctionExpression | t.ArrowFunctionExpression {
const reactiveFunction = buildReactiveFunction(loweredFunc);
pruneUnusedLabels(reactiveFunction);
pruneUnusedLValues(reactiveFunction);
pruneHoistedContexts(reactiveFunction);
const fn = codegenReactiveFunction(
new Context(
cx.env,
reactiveFunction.id ?? "[[ anonymous ]]",
cx.uniqueIdentifiers,
cx.temp
),
reactiveFunction
).unwrap();
if (fnType === "ArrowFunctionExpression") {
let body: t.BlockStatement | t.Expression = fn.body;
if (body.body.length === 1 && loweredFunc.directives.length == 0) {
const stmt = body.body[0]!;
if (stmt.type === "ReturnStatement" && stmt.argument != null) {
body = stmt.argument;
}
}
return t.arrowFunctionExpression(fn.params, body, fn.async);
}
return t.functionExpression(
fn.id ?? (name != null ? t.identifier(name) : null),
fn.params,
fn.body,
fn.generator,
fn.async
);
}

function codegenJsxAttribute(
cx: Context,
attribute: JsxAttribute
Expand Down