From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Mon, 12 Oct 2020 17:30:21 +0000 (+0100)
Subject: fix corner case in `collapse_vars` (#4206)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=9272f662c0c89387a2bc9e7a47024ccc9d0c09a4;p=UglifyJS.git

fix corner case in `collapse_vars` (#4206)

fixes #4205
---

diff --git a/lib/compress.js b/lib/compress.js
index f6de8656..bc01ebc3 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -1494,14 +1494,22 @@ merge(Compressor.prototype, {
             }
 
             function handle_custom_scan_order(node, tt) {
+                if (!(node instanceof AST_BlockScope)) return;
+                // Skip (non-executed) functions
+                if (node instanceof AST_Scope) return node;
+                // Stop upon collision with block-scoped variables
+                if (node.variables && !node.variables.all(function(def) {
+                    return !lvalues.has(def.name);
+                })) {
+                    abort = true;
+                    return node;
+                }
                 // Scan object only in a for-in statement
                 if (node instanceof AST_ForIn) {
                     node.object = node.object.transform(tt);
                     abort = true;
                     return node;
                 }
-                // Skip (non-executed) functions
-                if (node instanceof AST_Scope) return node;
                 // Scan first case expression only in a switch statement
                 if (node instanceof AST_Switch) {
                     node.expression = node.expression.transform(tt);
diff --git a/test/compress/const.js b/test/compress/const.js
index 28dda019..d1164cc1 100644
--- a/test/compress/const.js
+++ b/test/compress/const.js
@@ -872,3 +872,40 @@ issue_4202: {
     }
     expect_stdout: "42"
 }
+
+issue_4205: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = function(b) {
+            var c = function() {
+                switch (0) {
+                  case a:
+                    return 0;
+                  case b:
+                  case console.log("PASS"):
+                }
+            }();
+            {
+                const b = c;
+            }
+        }();
+    }
+    expect: {
+        var a = function(b) {
+            var c = function() {
+                switch (0) {
+                  case a:
+                    return 0;
+                  case b:
+                  case console.log("PASS"):
+                }
+            }();
+            {
+                const b = c;
+            }
+        }();
+    }
+    expect_stdout: true
+}