Skip to content

feat(minifier): improve mangleFor #8901

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
Feb 9, 2025
Merged

feat(minifier): improve mangleFor #8901

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
70 changes: 66 additions & 4 deletions crates/oxc_minifier/src/peephole/minimize_for_statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,17 @@ use super::PeepholeOptimizations;
impl<'a> PeepholeOptimizations {
/// `mangleFor`: <https://github.com/evanw/esbuild/blob/v0.24.2/internal/js_ast/js_parser.go#L9801>
pub fn minimize_for_statement(&mut self, for_stmt: &mut ForStatement<'a>, ctx: Ctx<'a, '_>) {
let Some(Statement::IfStatement(if_stmt)) = for_stmt.body.get_one_child_mut() else {
// Get the first statement in the loop
let mut first = &for_stmt.body;
if let Statement::BlockStatement(block_stmt) = first {
if let Some(b) = block_stmt.body.first() {
first = b;
} else {
return;
}
};

let Statement::IfStatement(if_stmt) = first else {
return;
};
// "for (;;) if (x) break;" => "for (; !x;) ;"
Expand All @@ -19,20 +29,34 @@ impl<'a> PeepholeOptimizations {
if break_stmt.label.is_some() {
return;
}

let span = for_stmt.body.span();
let (first, body) = match ctx.ast.move_statement(&mut for_stmt.body) {
Statement::BlockStatement(mut block_stmt) => (
ctx.ast.move_statement(block_stmt.body.get_mut(0).unwrap()),
Some(Statement::BlockStatement(block_stmt)),
),
stmt => (stmt, None),
};

let Statement::IfStatement(mut if_stmt) = first else { unreachable!() };

let expr = match ctx.ast.move_expression(&mut if_stmt.test) {
Expression::UnaryExpression(unary_expr) if unary_expr.operator.is_not() => {
unary_expr.unbox().argument
}
e => Self::minimize_not(e.span(), e, ctx),
};

if let Some(test) = &mut for_stmt.test {
let e = ctx.ast.move_expression(test);
*test = ctx.ast.expression_logical(test.span(), e, LogicalOperator::And, expr);
} else {
for_stmt.test = Some(expr);
}
for_stmt.body =
if_stmt.alternate.take().unwrap_or_else(|| ctx.ast.statement_empty(if_stmt.span));

let alternate = if_stmt.alternate.take();
for_stmt.body = Self::drop_first_statement(span, body, alternate, ctx);
self.mark_current_function_as_changed();
return;
}
Expand All @@ -44,15 +68,53 @@ impl<'a> PeepholeOptimizations {
if break_stmt.label.is_some() {
return;
}

let span = for_stmt.body.span();
let (first, body) = match ctx.ast.move_statement(&mut for_stmt.body) {
Statement::BlockStatement(mut block_stmt) => (
ctx.ast.move_statement(block_stmt.body.get_mut(0).unwrap()),
Some(Statement::BlockStatement(block_stmt)),
),
stmt => (stmt, None),
};

let Statement::IfStatement(mut if_stmt) = first else { unreachable!() };

let expr = ctx.ast.move_expression(&mut if_stmt.test);

if let Some(test) = &mut for_stmt.test {
let e = ctx.ast.move_expression(test);
*test = ctx.ast.expression_logical(test.span(), e, LogicalOperator::And, expr);
} else {
for_stmt.test = Some(expr);
}
for_stmt.body = ctx.ast.move_statement(&mut if_stmt.consequent);

let consequent = ctx.ast.move_statement(&mut if_stmt.consequent);
for_stmt.body = Self::drop_first_statement(span, body, Some(consequent), ctx);
self.mark_current_function_as_changed();
}
}

fn drop_first_statement(
span: Span,
body: Option<Statement<'a>>,
replace: Option<Statement<'a>>,
ctx: Ctx<'a, '_>,
) -> Statement<'a> {
match body {
Some(Statement::BlockStatement(mut block_stmt)) if !block_stmt.body.is_empty() => {
if let Some(replace) = replace {
block_stmt.body[0] = replace;
} else if block_stmt.body.len() == 2
&& !Self::statement_cares_about_scope(&block_stmt.body[1])
{
return ctx.ast.move_statement(&mut block_stmt.body[1]);
} else {
block_stmt.body.remove(0);
}
Statement::BlockStatement(block_stmt)
}
_ => replace.unwrap_or_else(|| ctx.ast.statement_empty(span)),
}
}
}
2 changes: 1 addition & 1 deletion crates/oxc_minifier/src/peephole/minimize_statements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ impl<'a> PeepholeOptimizations {
}

/// `statementCaresAboutScope`: <https://github.com/evanw/esbuild/blob/v0.24.2/internal/js_ast/js_parser.go#L9767>
fn statement_cares_about_scope(stmt: &Statement<'a>) -> bool {
pub fn statement_cares_about_scope(stmt: &Statement<'a>) -> bool {
match stmt {
Statement::BlockStatement(_)
| Statement::EmptyStatement(_)
Expand Down
13 changes: 6 additions & 7 deletions crates/oxc_minifier/tests/peephole/esbuild.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,18 @@ fn js_parser_test() {
test("for (; ;) if (!x) break;", "for (; x; ) ;");
test("for (; a;) if (x) break;", "for (; a && !x; ) ;");
test("for (; a;) if (!x) break;", "for (; a && x; ) ;");
// TODO: optimizeImplicitJump in `mangleStmts`
// test("for (; ;) { if (x) break; y(); }", "for (; !x; ) y();");
// test("for (; a;) { if (x) break; y(); }", "for (; a && !x; ) y();");
test("for (; ;) { if (x) break; y(); }", "for (; !x; ) y();");
test("for (; a;) { if (x) break; y(); }", "for (; a && !x; ) y();");
test("for (; ;) if (x) break; else y();", "for (; !x; ) y();");
test("for (; a;) if (x) break; else y();", "for (; a && !x; ) y();");
// test("for (; ;) { if (x) break; else y(); z(); }", "for (; !x; ) y(), z();");
// test("for (; a;) { if (x) break; else y(); z(); }", "for (; a && !x; ) y(), z();");
test("for (; ;) { if (x) break; else y(); z(); }", "for (; !x; ) y(), z();");
test("for (; a;) { if (x) break; else y(); z(); }", "for (; a && !x; ) y(), z();");
test("for (; ;) if (x) y(); else break;", "for (; x; ) y();");
test("for (; ;) if (!x) y(); else break;", "for (; !x; ) y();");
test("for (; a;) if (x) y(); else break;", "for (; a && x; ) y();");
test("for (; a;) if (!x) y(); else break;", "for (; a && !x; ) y();");
// test("for (; ;) { if (x) y(); else break; z(); }", "for (; x; ) { y(); z();}");
// test("for (; a;) { if (x) y(); else break; z(); }", "for (; a && x; ) { y(); z();}");
test("for (; ;) { if (x) y(); else break; z(); }", "for (; x; ) y(), z()");
test("for (; a;) { if (x) y(); else break; z(); }", "for (; a && x; ) y(), z()");
test("while (x) { if (1) break; z(); }", "for (; x; ) break;");
test("while (x) { if (1) continue; z(); }", "for (; x; ) ;");
test(
Expand Down
14 changes: 7 additions & 7 deletions tasks/minsize/minsize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ Original | minified | minified | gzip | gzip | Fixture

173.90 kB | 59.54 kB | 59.82 kB | 19.18 kB | 19.33 kB | moment.js

287.63 kB | 89.46 kB | 90.07 kB | 30.97 kB | 31.95 kB | jquery.js
287.63 kB | 89.45 kB | 90.07 kB | 30.97 kB | 31.95 kB | jquery.js

342.15 kB | 117.62 kB | 118.14 kB | 43.45 kB | 44.37 kB | vue.js
342.15 kB | 117.61 kB | 118.14 kB | 43.45 kB | 44.37 kB | vue.js

544.10 kB | 71.40 kB | 72.48 kB | 25.86 kB | 26.20 kB | lodash.js

555.77 kB | 271.12 kB | 270.13 kB | 88.26 kB | 90.80 kB | d3.js
555.77 kB | 271.11 kB | 270.13 kB | 88.26 kB | 90.80 kB | d3.js

1.01 MB | 440.94 kB | 458.89 kB | 122.52 kB | 126.71 kB | bundle.min.js
1.01 MB | 440.89 kB | 458.89 kB | 122.52 kB | 126.71 kB | bundle.min.js

1.25 MB | 650.30 kB | 646.76 kB | 160.95 kB | 163.73 kB | three.js

2.14 MB | 716.93 kB | 724.14 kB | 161.98 kB | 181.07 kB | victory.js
2.14 MB | 716.92 kB | 724.14 kB | 161.98 kB | 181.07 kB | victory.js

3.20 MB | 1.01 MB | 1.01 MB | 324.33 kB | 331.56 kB | echarts.js
3.20 MB | 1.01 MB | 1.01 MB | 324.32 kB | 331.56 kB | echarts.js

6.69 MB | 2.28 MB | 2.31 MB | 467.77 kB | 488.28 kB | antd.js

10.95 MB | 3.36 MB | 3.49 MB | 861.79 kB | 915.50 kB | typescript.js
10.95 MB | 3.36 MB | 3.49 MB | 861.77 kB | 915.50 kB | typescript.js

Loading