Skip to content

fix(minifier): skip try_fold_stmt_in_boolean_context on ExpressionStatement #9458

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
Mar 1, 2025
Merged

fix(minifier): skip try_fold_stmt_in_boolean_context on ExpressionStatement #9458

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
fix(minifier): skip try_fold_stmt_in_boolean_context on `Expression… 
…Statement` (#9458)

`remove_unused_expression` can handle this case better than `try_fold_stmt_in_boolean_context`.
  • Loading branch information
@sapphi-red
sapphi-red committed Mar 1, 2025
commit 071c84c1fd6aa27b2f0494e3997e6e193b6c696c
9 changes: 0 additions & 9 deletions crates/oxc_minifier/src/peephole/minimize_expression_in_boolean_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use oxc_ast::ast::*;
use oxc_ecmascript::constant_evaluation::{ConstantEvaluation, IsInt32OrUint32};
use oxc_span::GetSpan;
use oxc_traverse::Ancestor;

use crate::ctx::Ctx;

Expand All @@ -14,14 +13,6 @@ impl<'a> PeepholeOptimizations {
Statement::WhileStatement(s) => Some(&mut s.test),
Statement::ForStatement(s) => s.test.as_mut(),
Statement::DoWhileStatement(s) => Some(&mut s.test),
Statement::ExpressionStatement(s)
if !matches!(
ctx.ancestry.ancestor(1),
Ancestor::ArrowFunctionExpressionBody(_)
) =>
{
Some(&mut s.expression)
}
_ => None,
};

Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_minifier/src/peephole/remove_unused_expression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ impl<'a> PeepholeOptimizations {
if alternate {
*e = self.join_with_left_associative_op(
conditional_expr.span,
LogicalOperator::Or,
LogicalOperator::And,
ctx.ast.move_expression(&mut conditional_expr.test),
ctx.ast.move_expression(&mut conditional_expr.consequent),
ctx,
Expand Down Expand Up @@ -630,7 +630,7 @@ mod test {
test("(1, foo()) ? 1 : 2", "foo()");
test("foo() ? 1 : 2", "foo()");
test("foo() ? 1 : bar()", "foo() || bar()");
test("foo() ? bar() : 2", "!foo() || bar()"); // can be improved to "foo() && bar()"
test("foo() ? bar() : 2", "foo() && bar()");
test_same("foo() ? bar() : baz()");
}

Expand Down
2 changes: 1 addition & 1 deletion tasks/minsize/minsize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Original | minified | minified | gzip | gzip | Fixture

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

10.95 MB | 3.35 MB | 3.49 MB | 860.99 kB | 915.50 kB | typescript.js
10.95 MB | 3.35 MB | 3.49 MB | 860.95 kB | 915.50 kB | typescript.js

Loading