From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Thu, 14 Mar 2019 08:05:56 +0000 (+0800)
Subject: fix corner case in `collapse_vars` (#3334)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=ebd82b3fb6773f1985752550254a2effcc70b4af;p=UglifyJS.git

fix corner case in `collapse_vars` (#3334)

fixes #3274
---

diff --git a/lib/compress.js b/lib/compress.js
index 2ccf330d..04adb8b2 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -1585,13 +1585,19 @@ merge(Compressor.prototype, {
                 var found = false;
                 return statements[stat_index].transform(new TreeTransformer(function(node, descend, in_list) {
                     if (found) return node;
-                    if (node === expr || node.body === expr) {
+                    if (node !== expr && node.body !== expr) return;
+                    if (node instanceof AST_VarDef) {
                         found = true;
-                        if (node instanceof AST_VarDef) {
-                            node.value = null;
-                            return node;
-                        }
-                        return in_list ? MAP.skip : null;
+                        node.value = null;
+                        return node;
+                    }
+                    if (in_list) {
+                        found = true;
+                        return MAP.skip;
+                    }
+                    if (!this.parent()) {
+                        found = true;
+                        return null;
                     }
                 }, function(node) {
                     if (node instanceof AST_Sequence) switch (node.expressions.length) {
diff --git a/test/compress/functions.js b/test/compress/functions.js
index 96689eae..96a58aa6 100644
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -2315,3 +2315,33 @@ issue_3125: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3274: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        join_vars: true,
+        loops: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var g = function(a) {
+                var c = a.p, b = c;
+                return b != c;
+            };
+            while (g(1))
+                console.log("FAIL");
+            console.log("PASS");
+        })();
+    }
+    expect: {
+        (function() {
+            for (var c; void 0, (c = 1..p) != c;)
+                console.log("FAIL");
+            console.log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}