Skip to content

perf(transformer/object-rest-spread): pass Box to make_object_spread #10446

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
graphite-app merged 1 commit into from
Apr 16, 2025
Merged

perf(transformer/object-rest-spread): pass Box to make_object_spread #10446

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
16 changes: 8 additions & 8 deletions crates/oxc_transformer/src/es2018/object_rest_spread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use std::mem;

use serde::Deserialize;

use oxc_allocator::{GetAddress, TakeIn, Vec as ArenaVec};
use oxc_allocator::{Box as ArenaBox, GetAddress, TakeIn, Vec as ArenaVec};
use oxc_ast::{NONE, ast::*};
use oxc_diagnostics::OxcDiagnostic;
use oxc_ecmascript::{
Expand Down Expand Up @@ -487,13 +487,13 @@ impl<'a, 'ctx> ObjectRestSpread<'a, 'ctx> {
return;
}

let mut call_expr: Option<CallExpression<'a>> = None;
let mut call_expr: Option<ArenaBox<'a, CallExpression<'a>>> = None;
let mut props = ctx.ast.vec_with_capacity(obj_expr.properties.len());

for prop in obj_expr.properties.drain(..) {
if let ObjectPropertyKind::SpreadProperty(spread_prop) = prop {
if let ObjectPropertyKind::SpreadProperty(mut spread_prop) = prop {
Self::make_object_spread(&mut call_expr, &mut props, transform_ctx, ctx);
let arg = spread_prop.unbox().argument.take_in(ctx.ast.allocator);
let arg = spread_prop.argument.take_in(ctx.ast.allocator);
call_expr.as_mut().unwrap().arguments.push(Argument::from(arg));
} else {
props.push(prop);
Expand All @@ -504,11 +504,11 @@ impl<'a, 'ctx> ObjectRestSpread<'a, 'ctx> {
Self::make_object_spread(&mut call_expr, &mut props, transform_ctx, ctx);
}

*expr = Expression::CallExpression(ctx.ast.alloc(call_expr.unwrap()));
*expr = Expression::CallExpression(call_expr.unwrap());
}

fn make_object_spread(
expr: &mut Option<CallExpression<'a>>,
expr: &mut Option<ArenaBox<'a, CallExpression<'a>>>,
props: &mut ArenaVec<'a, ObjectPropertyKind<'a>>,
transform_ctx: &'ctx TransformCtx<'a>,
ctx: &mut TraverseCtx<'a>,
Expand All @@ -520,7 +520,7 @@ impl<'a, 'ctx> ObjectRestSpread<'a, 'ctx> {
mem::replace(props, ctx.ast.vec_with_capacity(props.capacity() - props.len())),
);
let arguments = if let Some(call_expr) = expr.take() {
let arg = Expression::CallExpression(ctx.ast.alloc(call_expr));
let arg = Expression::CallExpression(call_expr);
let arg = Argument::from(arg);
if had_props {
let empty_object = ctx.ast.expression_object(SPAN, ctx.ast.vec());
Expand All @@ -532,7 +532,7 @@ impl<'a, 'ctx> ObjectRestSpread<'a, 'ctx> {
ctx.ast.vec1(Argument::from(obj))
};
let new_expr = transform_ctx.helper_call(Helper::ObjectSpread2, SPAN, arguments, ctx);
expr.replace(new_expr);
expr.replace(ctx.ast.alloc(new_expr));
}
}

Expand Down
Loading