fix corner case in collapse_vars (#3627)

fixes #3626
mishoo · Dec 4, 2019 · bf7e4ca · bf7e4ca
1 parent d68ddc3
commit bf7e4ca
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -1578,9 +1578,11 @@ merge(Compressor.prototype, {
                 }
                 if (parent instanceof AST_Binary) {
                     if (lazy_op[parent.operator] && parent.left !== node) {
-                        var grandparent = scanner.parent(level + 1);
-                        if (!(grandparent instanceof AST_Binary)) return node;
-                        if (grandparent.operator != parent.operator) return node;
+                        do {
+                            node = parent;
+                            parent = scanner.parent(++level);
+                        } while (parent instanceof AST_Binary && parent.operator == node.operator);
+                        return node;
                     }
                     return find_stop_value(parent, level + 1);
                 }

diff --git a/test/compress/collapse_vars.js b/test/compress/collapse_vars.js
@@ -7308,3 +7308,40 @@ substitution_unary: {
         "true 42 42",
     ]
 }
+
+issue_3626_1: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = "foo", b = 42;
+        a.p && (b = a) && a;
+        console.log(a, b);
+    }
+    expect: {
+        var a = "foo", b = 42;
+        a.p && (b = a) && a;
+        console.log(a, b);
+    }
+    expect_stdout: "foo 42"
+}
+
+issue_3626_2: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+    }
+    input: {
+        var a = "foo", b = 42, c = null;
+        if (a && a.p)
+            if (b = a)
+                c++ + a;
+        console.log(a, b, c);
+    }
+    expect: {
+        var a = "foo", b = 42, c = null;
+        a && a.p && (b = a) && c++ + a;
+        console.log(a, b, c);
+    }
+    expect_stdout: "foo 42 null"
+}