Skip to content

fix(minifier): should not merge conditional function calls if referencing the function has a side-effect #8922

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 6, 2025
Merged

fix(minifier): should not merge conditional function calls if referencing the function has a side-effect #8922

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
24 changes: 15 additions & 9 deletions crates/oxc_minifier/src/peephole/minimize_conditional_expression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use oxc_ast::{ast::*, NONE};
use oxc_ecmascript::side_effects::MayHaveSideEffects;
use oxc_span::{ContentEq, GetSpan};
use oxc_syntax::es_target::ESTarget;

Expand Down Expand Up @@ -241,14 +242,15 @@ impl<'a> PeepholeOptimizations {
}

// `a ? b(c, d) : b(e, d)` -> `b(a ? c : e, d)`
if let (
Expression::Identifier(test),
Expression::CallExpression(consequent),
Expression::CallExpression(alternate),
) = (&expr.test, &mut expr.consequent, &mut expr.alternate)
if let (Expression::CallExpression(consequent), Expression::CallExpression(alternate)) =
(&mut expr.consequent, &mut expr.alternate)
{
if consequent.arguments.len() == alternate.arguments.len()
&& !ctx.is_global_reference(test)
// we can improve compression by allowing side effects on one side if the other side is
// an identifier that is not modified after it is declared.
// but for now, we only perform compression if neither side has side effects.
&& !(ctx.expression_may_have_side_effects(&expr.test)
|| ctx.expression_may_have_side_effects(&consequent.callee))
&& ctx.expr_eq(&consequent.callee, &alternate.callee)
&& consequent
.arguments
Expand Down Expand Up @@ -647,9 +649,13 @@ mod test {
test("a ? (b, c) : c", "(a && b), c");
test("a ? b || c : c", "(a && b) || c");
test("a ? c : b && c", "(a || b) && c");
test("var a; a ? b(c, d) : b(e, d)", "var a; b(a ? c : e, d)");
test("var a; a ? b(...c) : b(...e)", "var a; b(...a ? c : e)");
test("var a; a ? b(c) : b(e)", "var a; b(a ? c : e)");
test("var a, b; a ? b(c, d) : b(e, d)", "var a, b; b(a ? c : e, d)");
test("var a, b; a ? b(...c) : b(...e)", "var a, b; b(...a ? c : e)");
test("var a, b; a ? b(c) : b(e)", "var a, b; b(a ? c : e)");
test("var a, b; a === 0 ? b(c) : b(e)", "var a, b; b(a === 0 ? c : e)");
test_same("var a; a === 0 ? b(c) : b(e)"); // accessing global `b` may assign a different value to `a`
test_same("var b; a === 0 ? b(c) : b(e)"); // accessing global `a` may assign a different value to `b`
test_same("a === 0 ? b(c) : b(e)"); // accessing global `a`, `b` may have a side effect
test("a() != null ? a() : b", "a() == null ? b : a()");
test("var a; a != null ? a : b", "var a; a ?? b");
test("var a; (a = _a) != null ? a : b", "var a; (a = _a) ?? b");
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_minifier/tests/peephole/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn integration() {
return console.log(JSON.stringify(os))
})",
r#"require("./index.js")(function(e, os) {
return console.log(e || JSON.stringify(os));
return e ? console.log(e) : console.log(JSON.stringify(os));
});"#,
);

Expand Down
12 changes: 6 additions & 6 deletions tasks/minsize/minsize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ Original | minified | minified | gzip | gzip | Fixture

555.77 kB | 271.20 kB | 270.13 kB | 88.30 kB | 90.80 kB | d3.js

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

1.25 MB | 650.33 kB | 646.76 kB | 160.96 kB | 163.73 kB | three.js
1.25 MB | 650.34 kB | 646.76 kB | 160.96 kB | 163.73 kB | three.js

2.14 MB | 717.02 kB | 724.14 kB | 162.02 kB | 181.07 kB | victory.js
2.14 MB | 717.04 kB | 724.14 kB | 162.02 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.34 kB | 331.56 kB | echarts.js

6.69 MB | 2.28 MB | 2.31 MB | 467.74 kB | 488.28 kB | antd.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.78 kB | 915.50 kB | typescript.js
10.95 MB | 3.36 MB | 3.49 MB | 861.80 kB | 915.50 kB | typescript.js

Loading