Skip to content

Commit

Permalink
fix(es/minifier): Compress consecutive return statements properly (#9620
Browse files Browse the repository at this point in the history
)

**Description:**

Compress consecutive return statements properly.

**Related issue:**

 - Closes #9619
  • Loading branch information
canalun authored Oct 7, 2024
1 parent 7b98bb5 commit 8263da1
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .changeset/famous-keys-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
swc_core: patch
swc_ecma_minifier: patch
---

fix: compress consecutive return statements properly
10 changes: 10 additions & 0 deletions crates/swc_ecma_minifier/src/compress/optimize/if_return.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,16 @@ impl Optimizer<'_> {
}
},

(
Some(Stmt::Block(BlockStmt { stmts: s1, .. })),
Some(Stmt::Block(BlockStmt { stmts: s2, .. })),
) if s1.iter().any(|s| matches!(s, Stmt::Return(..)))
&& s2.iter().any(|s| matches!(s, Stmt::Return(..))) =>
{
log_abort!("if_return: [x] Aborting because early return is observed");
return;
}

_ => {}
}
}
Expand Down
47 changes: 47 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/9619/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"arguments": false,
"arrows": false,
"booleans": false,
"booleans_as_integers": false,
"collapse_vars": false,
"comparisons": false,
"computed_props": false,
"conditionals": false,
"dead_code": true,
"directives": false,
"drop_console": false,
"drop_debugger": false,
"evaluate": false,
"expression": false,
"hoist_funs": false,
"hoist_props": false,
"hoist_vars": false,
"if_return": true,
"join_vars": false,
"keep_classnames": false,
"keep_fargs": false,
"keep_fnames": false,
"keep_infinity": false,
"loops": false,
"negate_iife": false,
"properties": false,
"reduce_funcs": false,
"reduce_vars": false,
"side_effects": false,
"switches": true,
"typeofs": false,
"unsafe": false,
"unsafe_arrows": false,
"unsafe_comps": false,
"unsafe_Function": false,
"unsafe_math": false,
"unsafe_symbols": false,
"unsafe_methods": false,
"unsafe_proto": false,
"unsafe_regexp": false,
"unsafe_undefined": false,
"unused": true,
"const_to_let": false,
"pristine_globals": false,
"passes": 1
}
17 changes: 17 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/9619/input.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
var a = (() => {
switch ("production") {
case "production":
return "expected";
default:
return "unexpected1";
}

switch ("production") {
case "production":
return "unexpected2";
default:
return "unexpected3";
}
})();

console.log(a);
2 changes: 2 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/9619/output.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
var a = (()=>"expected")();
console.log(a);

0 comments on commit 8263da1

Please sign in to comment.