fix corner case in if_return (#5603)

fixes #5602
mishoo · Aug 5, 2022 · a9d9af5 · a9d9af5
1 parent 8a07f12
commit a9d9af5
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 2 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -3595,8 +3595,8 @@ Compressor.prototype.compress = function(node) {
                         stat = stat.clone();
                         exprs.push(stat.condition);
                         stat.condition = make_sequence(stat, exprs);
-                        stat.alternative = make_node(AST_BlockStatement, next, {
-                            body: extract_functions().concat(make_node(AST_Return, next, { value: null })),
+                        stat.alternative = make_node(AST_BlockStatement, self, {
+                            body: extract_functions().concat(make_node(AST_Return, self, { value: null })),
                         });
                         statements[i] = stat.transform(compressor);
                         i = prev + 1;

diff --git a/test/compress/spreads.js b/test/compress/spreads.js
@@ -1203,3 +1203,53 @@ issue_5382: {
     expect_stdout: "PASS"
     node_version: ">=8.3.0"
 }
+
+issue_5602: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        evaluate: true,
+        if_return: true,
+        inline: true,
+        passes: 2,
+        sequences: true,
+        spreads: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            try {
+                var b = function(c) {
+                    if (c)
+                        return FAIL;
+                    var d = 42;
+                }(...[ null, A = 0 ]);
+            } catch (e) {
+                b();
+            }
+        })();
+        console.log(A);
+    }
+    expect: {
+        (function() {
+            try {
+                var b = void (A = 0);
+            } catch (e) {
+                b();
+            }
+        })(),
+        console.log(A);
+    }
+    expect_stdout: "0"
+    expect_warnings: [
+        "INFO: Dropping unused variable d [test/compress/spreads.js:6,24]",
+        "INFO: Collapsing c [test/compress/spreads.js:4,24]",
+        "INFO: Dropping unused variable c [test/compress/spreads.js:3,33]",
+        "INFO: pass 0: last_count: Infinity, count: 27",
+        "WARN: Condition always false [test/compress/spreads.js:4,20]",
+        "INFO: Collapsing null [test/compress/spreads.js:7,23]",
+        "INFO: Collapsing 0 [test/compress/spreads.js:3,24]",
+        "INFO: pass 1: last_count: 27, count: 22",
+    ]
+    node_version: ">=6"
+}