Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
42 changes: 41 additions & 1 deletion crates/swc_ecma_minifier/src/compress/optimize/conditionals.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::mem::swap;
use std::mem::{swap, take};

use swc_common::{util::take::Take, EqIgnoreSpan, Spanned, SyntaxContext, DUMMY_SP};
use swc_ecma_ast::*;
Expand Down Expand Up @@ -184,6 +184,46 @@ impl Optimizer<'_> {
*stmts = new;
}

pub(super) fn expand_if_stmt_from_cond(&mut self, s: &mut Stmt) {
loop {
if let Stmt::Return(r) = s {
if let Some(Expr::Cond(c)) = r.arg.as_deref_mut() {
*s = Stmt::If(IfStmt {
span: c.span,
test: take(&mut c.test),
cons: Box::new(Stmt::Return(ReturnStmt {
span: r.span,
arg: Some(take(&mut c.cons)),
})),
alt: Some(Box::new(Stmt::Return(ReturnStmt {
span: r.span,
arg: Some(take(&mut c.alt)),
}))),
});
continue;
}
}
if let Stmt::Expr(e) = s {
if let Expr::Cond(c) = &mut *e.expr {
*s = Stmt::If(IfStmt {
span: c.span,
test: take(&mut c.test),
cons: Box::new(Stmt::Expr(ExprStmt {
span: e.span,
expr: take(&mut c.cons),
})),
alt: Some(Box::new(Stmt::Expr(ExprStmt {
span: e.span,
expr: take(&mut c.alt),
}))),
});
continue;
}
}
break;
}
}

///
/// # Examples
///
Expand Down
2 changes: 2 additions & 0 deletions crates/swc_ecma_minifier/src/compress/optimize/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2401,6 +2401,8 @@ impl VisitMut for Optimizer<'_> {
}
};

self.expand_if_stmt_from_cond(s);

let ctx = self
.ctx
.clone()
Expand Down
Loading