fix(es/resolver): Make catch parameter not disturb resolving (#4976)

Cargo.toml

@@ -42,7 +42,3 @@ opt-level = 3
 
 [profile.test.package.pretty_assertions]
 opt-level = 3
-
-[patch.crates-io]
-cranelift-codegen = {git = "https://github.com/kdy1/wasmtime", branch = "tls"}
-cranelift-entity = {git = "https://github.com/kdy1/wasmtime", branch = "tls"}

crates/swc/tests/fixture/issues-4xxx/4953/input/.swcrc

@@ -0,0 +1,77 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "ecmascript",
+            "jsx": false
+        },
+        "target": "es2015",
+        "loose": false,
+        "minify": {
+            "compress": {
+                "arguments": false,
+                "arrows": true,
+                "booleans": true,
+                "booleans_as_integers": false,
+                "collapse_vars": true,
+                "comparisons": true,
+                "computed_props": false,
+                "conditionals": false,
+                "dead_code": false,
+                "directives": false,
+                "drop_console": false,
+                "drop_debugger": true,
+                "evaluate": true,
+                "expression": false,
+                "hoist_funs": false,
+                "hoist_props": true,
+                "hoist_vars": false,
+                "if_return": true,
+                "join_vars": true,
+                "keep_classnames": false,
+                "keep_fargs": true,
+                "keep_fnames": false,
+                "keep_infinity": false,
+                "loops": true,
+                "negate_iife": true,
+                "properties": true,
+                "reduce_funcs": false,
+                "reduce_vars": false,
+                "side_effects": true,
+                "switches": false,
+                "typeofs": true,
+                "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
+            },
+            "mangle": {
+                "toplevel": false,
+                "keep_classnames": false,
+                "keep_fnames": false,
+                "keep_private_props": false,
+                "ie8": false,
+                "safari10": false
+            }
+        },
+        "transform": {
+            "react": {
+                "refresh": true,
+                "development": true
+            },
+            "optimizer": {
+                "simplify": true
+            }
+        }
+    },
+    "module": {
+        "type": "commonjs"
+    },
+    "minify": false
+}

crates/swc/tests/fixture/issues-4xxx/4953/input/index.js

@@ -0,0 +1,19 @@
+/* eslint-disable */
+export default function (module, exports) {
+    "use strict";
+    !function (t, e) {
+        e(exports)
+    }(void 0, function (t) {
+        "use strict";
+        function vr(e, r, o) {
+            try {
+            } catch (t) {
+            }
+            function t() {
+                return '123';
+            }
+            return t;
+        }
+        t.vr = vr;
+    });
+};

crates/swc/tests/fixture/issues-4xxx/4953/output/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.default = function(a, b) {
+    "use strict";
+    !function(c, a) {
+        a(b);
+    }(void 0, function(a) {
+        "use strict";
+        a.vr = function(b, c, d) {
+            function a() {
+                return '123';
+            }
+            return a;
+        };
+    });
+};

crates/swc_ecma_minifier/tests/golden.txt

@@ -541,6 +541,7 @@ functions/drop_lone_use_strict/input.js
 functions/drop_lone_use_strict_arrows_1/input.js
 functions/drop_lone_use_strict_arrows_2/input.js
 functions/duplicate_argnames/input.js
+functions/empty_body/input.js
 functions/function_returning_constant_literal/input.js
 functions/iifes_returning_constants_keep_fargs_false/input.js
 functions/iifes_returning_constants_keep_fargs_true/input.js

crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/defun_catch_6/analysis-snapshot.rust-debug

@@ -3,7 +3,7 @@ TestSnapshot {
         (
             (
                 Atom('a' type=inline),
-                #0,
+                #1,
             ),
             VarUsageInfo {
                 inline_prevented: false,
@@ -41,7 +41,7 @@ TestSnapshot {
         (
             (
                 Atom('a' type=inline),
-                #1,
+                #2,
             ),
             VarUsageInfo {
                 inline_prevented: false,
@@ -79,7 +79,7 @@ TestSnapshot {
         (
             (
                 Atom('console' type=inline),
-                #2,
+                #3,
             ),
             VarUsageInfo {
                 inline_prevented: false,

crates/swc_ecma_transforms_base/src/resolver/mod.rs

@@ -1481,11 +1481,6 @@ impl VisitMut for Hoister<'_, '_> {
         if self.catch_param_decls.contains(&node.ident.sym) {
             return;
         }
-        let _span = if LOG {
-            Some(span!(Level::ERROR, "Hoister.visit_mut_fn_decl").entered())
-        } else {
-            None
-        };
 
         if self.in_block {
             // If we are in nested block, and variable named `foo` is declared, we should
@@ -1640,11 +1635,22 @@ impl VisitMut for Hoister<'_, '_> {
 
         for item in items {
             match item {
-                ModuleItem::Stmt(Stmt::Decl(Decl::Var(decl)))
+                ModuleItem::Stmt(Stmt::Decl(
+                    Decl::Var(VarDecl {
+                        kind: VarDeclKind::Var,
+                        ..
+                    })
+                    | Decl::Fn(..),
+                ))
                 | ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(ExportDecl {
-                    decl: Decl::Var(decl),
+                    decl:
+                        Decl::Var(VarDecl {
+                            kind: VarDeclKind::Var,
+                            ..
+                        })
+                        | Decl::Fn(..),
                     ..
-                })) if decl.kind == VarDeclKind::Var => {
+                })) => {
                     item.visit_mut_with(self);
                 }
                 _ => {
@@ -1664,7 +1670,11 @@ impl VisitMut for Hoister<'_, '_> {
 
         for item in stmts {
             match item {
-                Stmt::Decl(Decl::Var(decl)) if decl.kind == VarDeclKind::Var => {
+                Stmt::Decl(Decl::Var(VarDecl {
+                    kind: VarDeclKind::Var,
+                    ..
+                }))
+                | Stmt::Decl(Decl::Fn(..)) => {
                     item.visit_mut_with(self);
                 }
                 _ => {

crates/swc_ecma_transforms_base/tests/resolver/issue-4953/input.js

@@ -0,0 +1,18 @@
+export default function (module, exports) {
+    "use strict";
+    !function (t, e) {
+        e(exports)
+    }(void 0, function (t) {
+        "use strict";
+        function vr(e, r, o) {
+            try {
+            } catch (t) {
+            }
+            function t() {
+                return '123';
+            }
+            return t;
+        }
+        t.vr = vr;
+    });
+};

crates/swc_ecma_transforms_base/tests/resolver/issue-4953/output.js

@@ -0,0 +1,17 @@
+export default function(module__1, exports__1) {
+    "use strict";
+    !function(t__2, e__2) {
+        e__2(exports__1);
+    }(void 0, function(t__3) {
+        "use strict";
+        function vr__3(e__4, r__4, o__4) {
+            try {} catch (t__5) {}
+            function t__4() {
+                return '123';
+            }
+            return t__4;
+        }
+        t__3.vr = vr__3;
+    });
+};
+;