Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
21 changes: 13 additions & 8 deletions crates/swc_ecma_minifier/src/compress/optimize/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -668,27 +668,32 @@ impl Optimizer<'_> {
return Some(cls.take().into());
}

let Some(side_effects) =
extract_class_side_effect(self.ctx.expr_ctx, &mut cls.class)
else {
return Some(cls.take().into());
};

report_change!(
"ignore_return_value: Dropping unused class expr as it does not have any side \
effect"
);
self.changed = true;

let exprs: Vec<Box<Expr>> =
extract_class_side_effect(self.ctx.expr_ctx, *cls.class.take())
.into_iter()
.filter_map(|mut e| self.ignore_return_value(&mut e))
.map(Box::new)
.collect();
let side_effects: Vec<Box<Expr>> = side_effects
.into_iter()
.filter_map(|e| self.ignore_return_value(e))
.map(Box::new)
.collect();

if exprs.is_empty() {
if side_effects.is_empty() {
return None;
}

return Some(
SeqExpr {
span: cls.class.span,
exprs,
exprs: side_effects,
}
.into(),
);
Expand Down
51 changes: 30 additions & 21 deletions crates/swc_ecma_minifier/src/compress/optimize/unused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -521,34 +521,43 @@ impl Optimizer<'_> {
.map(|v| v.usage_count == 0 && v.property_mutation_count == 0)
.unwrap_or(false)
{
let class = decl.as_mut_class().unwrap();
let Some(side_effects) =
extract_class_side_effect(self.ctx.expr_ctx, &mut class.class)
else {
return;
};

self.changed = true;
report_change!(
"unused: Dropping a decl '{}{:?}' because it is not used",
ident.sym,
ident.ctxt
);
// This will remove the declaration.
let class = decl.take().class().unwrap();
let mut side_effects =
extract_class_side_effect(self.ctx.expr_ctx, *class.class);

if !side_effects.is_empty() {
self.prepend_stmts.push(
ExprStmt {
span: DUMMY_SP,
expr: if side_effects.len() > 1 {
SeqExpr {
span: DUMMY_SP,
exprs: side_effects,
}
.into()
} else {
side_effects.remove(0)
},
}
.into(),
)

let mut side_effects: Vec<_> =
side_effects.into_iter().map(|expr| expr.take()).collect();
decl.take();

if side_effects.is_empty() {
return;
}

self.prepend_stmts.push(
ExprStmt {
span: DUMMY_SP,
expr: if side_effects.len() > 1 {
SeqExpr {
span: DUMMY_SP,
exprs: side_effects,
}
.into()
} else {
side_effects.remove(0)
},
}
.into(),
);
}
}
Decl::Fn(FnDecl { ident, .. }) => {
Expand Down
27 changes: 18 additions & 9 deletions crates/swc_ecma_minifier/src/compress/optimize/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use swc_atoms::Atom;
use swc_common::{util::take::Take, Mark, SyntaxContext, DUMMY_SP};
use swc_ecma_ast::*;
use swc_ecma_transforms_base::perf::{Parallel, ParallelExt};
use swc_ecma_utils::{collect_decls, ExprCtx, ExprExt, Remapper};
use swc_ecma_utils::{collect_decls, contains_this_expr, ExprCtx, ExprExt, Remapper};
use swc_ecma_visit::{noop_visit_mut_type, VisitMut, VisitMutWith};
use tracing::debug;

Expand Down Expand Up @@ -161,34 +161,40 @@ impl Drop for WithCtx<'_, '_> {
}
}

pub(crate) fn extract_class_side_effect(expr_ctx: ExprCtx, c: Class) -> Vec<Box<Expr>> {
pub(crate) fn extract_class_side_effect(
expr_ctx: ExprCtx,
c: &mut Class,
) -> Option<Vec<&mut Box<Expr>>> {
let mut res = Vec::new();
if let Some(e) = c.super_class {
if let Some(e) = &mut c.super_class {
if e.may_have_side_effects(expr_ctx) {
res.push(e);
}
}

for m in c.body {
for m in &mut c.body {
match m {
ClassMember::Method(ClassMethod {
key: PropName::Computed(key),
..
}) => {
if key.expr.may_have_side_effects(expr_ctx) {
res.push(key.expr);
res.push(&mut key.expr);
}
}

ClassMember::ClassProp(p) => {
if let PropName::Computed(key) = p.key {
if let PropName::Computed(key) = &mut p.key {
if key.expr.may_have_side_effects(expr_ctx) {
res.push(key.expr);
res.push(&mut key.expr);
}
}

if let Some(v) = p.value {
if let Some(v) = &mut p.value {
if p.is_static && v.may_have_side_effects(expr_ctx) {
if contains_this_expr(v) {
return None;
}
res.push(v);
}
}
Expand All @@ -199,6 +205,9 @@ pub(crate) fn extract_class_side_effect(expr_ctx: ExprCtx, c: Class) -> Vec<Box<
..
}) => {
if v.may_have_side_effects(expr_ctx) {
if contains_this_expr(v) {
return None;
}
res.push(v);
}
}
Expand All @@ -207,7 +216,7 @@ pub(crate) fn extract_class_side_effect(expr_ctx: ExprCtx, c: Class) -> Vec<Box<
}
}

res
Some(res)
}

pub(crate) fn is_valid_for_lhs(e: &Expr) -> bool {
Expand Down
15 changes: 15 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/10981/input.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
class C {
static foo = bar;
}

(class C {
static foo = bar;
});

class D {
static #_ = (this.FOO = {});
}

(class D {
static #_ = (this.FOO = {});
});
10 changes: 10 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/10981/output.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class C {
static foo = bar;
}
bar;
class D {
static #_ = this.FOO = {};
}
(class {
static #_ = this.FOO = {};
});
Loading