Skip to content
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.

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

fix(es/minifier): Don't remove used var decl #7200

Merged
merged 6 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,52 @@
import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
import { _ as _inherits } from "@swc/helpers/_/_inherits";
import { _ as _create_super } from "@swc/helpers/_/_create_super";
var E = function(D) {
"use strict";
_inherits(E, D);
var _super = _create_super(E);
function E() {
return _class_call_check(this, E), _super.apply(this, arguments);
}
return E;
}(function(C) {
"use strict";
_inherits(D, C);
var _super = _create_super(D);
function D() {
return _class_call_check(this, D), _super.apply(this, arguments);
}
return D;
}(function(E) {
"use strict";
_inherits(C, E);
var _super = _create_super(C);
function C() {
return _class_call_check(this, C), _super.apply(this, arguments);
}
return C;
}(E))), E2 = function(D2) {
"use strict";
_inherits(E2, D2);
var _super = _create_super(E2);
function E2() {
return _class_call_check(this, E2), _super.apply(this, arguments);
}
return E2;
}(function(C2) {
"use strict";
_inherits(D2, C2);
var _super = _create_super(D2);
function D2() {
return _class_call_check(this, D2), _super.apply(this, arguments);
}
return D2;
}(function(E2) {
"use strict";
_inherits(C2, E2);
var _super = _create_super(C2);
function C2() {
return _class_call_check(this, C2), _super.apply(this, arguments);
}
return C2;
}(E2)));
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"collapse_vars": true,
"unused": true,
"passes": 1,

"arguments": false,
"arrows": false,
"booleans": false,
"booleans_as_integers": false,
"comparisons": false,
"computed_props": false,
"conditionals": false,
"dead_code": false,
"directives": false,
"drop_console": false,
"drop_debugger": false,
"evaluate": false,
"expression": false,
"hoist_funs": false,
"hoist_props": false,
"hoist_vars": false,
"if_return": false,
"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": false,
"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,
"const_to_let": false,
"pristine_globals": false
}
11 changes: 11 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/7194/1/input.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
function example() {
var MyEnum = /*#__PURE__*/function (MyEnumInner) {
MyEnumInner["First"] = "first";
MyEnumInner["Second"] = "second";
return MyEnumInner;
}(MyEnum || {});

return MyEnum
}

example()
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function example() {
var MyEnum = function(MyEnumInner) {
MyEnumInner["First"] = "first";
MyEnumInner["Second"] = "second";
return MyEnumInner;
}(MyEnum || {});
return MyEnum;
}
example();
9 changes: 3 additions & 6 deletions crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1205,20 +1205,17 @@ where
..self.ctx
};

if let Some(marks) = &self.marks {
if let Some(..) = &self.marks {
if let VarDeclarator {
name: Pat::Ident(id),
init: Some(init),
init: Some(..),
definite: false,
..
} = e
{
// TODO: merge with may_have_side_effects
let can_ignore =
matches!(&**init, Expr::Call(call) if call.span.has_mark(marks.pure));
let id = id.to_id();
self.used_recursively
.insert(id.clone(), RecursiveUsage::Var { can_ignore });
.insert(id.clone(), RecursiveUsage::Var { can_ignore: false });
e.init.visit_with(&mut *self.with_ctx(ctx));
self.used_recursively.remove(&id);
return;
Expand Down