From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Wed, 10 Feb 2021 01:13:38 +0000 (+0000)
Subject: fix corner case in `merge_vars` (#4635)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=c76481341ca62e6c651f4bc8db7ed3508423b421;p=UglifyJS.git

fix corner case in `merge_vars` (#4635)
---

diff --git a/lib/compress.js b/lib/compress.js
index 3fcfe2d2..b35fc6a5 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -5045,6 +5045,7 @@ merge(Compressor.prototype, {
         return self;
     });
 
+    var NO_MERGE = makePredicate("arguments await yield");
     AST_Scope.DEFMETHOD("merge_variables", function(compressor) {
         if (!compressor.option("merge_vars")) return;
         var self = this, segment = {}, root;
@@ -5386,7 +5387,7 @@ merge(Compressor.prototype, {
             } else if ((ldef = self.variables.get(def.name)) !== def) {
                 if (ldef && root === segment) references[ldef.id] = false;
                 return references[def.id] = false;
-            } else if (compressor.exposed(def) || sym.name == "arguments" || sym.name == "await") {
+            } else if (compressor.exposed(def) || NO_MERGE[sym.name]) {
                 return references[def.id] = false;
             } else {
                 var refs = declarations.get(def.id) || [];
diff --git a/test/compress/yields.js b/test/compress/yields.js
index 7f85059b..5a6948ed 100644
--- a/test/compress/yields.js
+++ b/test/compress/yields.js
@@ -602,6 +602,62 @@ inline_nested_yield: {
     node_version: ">=4"
 }
 
+issue_4454_1: {
+    rename = false
+    options = {
+        merge_vars: true,
+    }
+    input: {
+        function f(a) {
+            (function*(b = console.log(a)) {})();
+            var yield = 42..toString();
+            console.log(yield);
+        }
+        f("PASS");
+    }
+    expect: {
+        function f(a) {
+            (function*(b = console.log(a)) {})();
+            var yield = 42..toString();
+            console.log(yield);
+        }
+        f("PASS");
+    }
+    expect_stdout: [
+        "PASS",
+        "42",
+    ]
+    node_version: ">=6"
+}
+
+issue_4454_2: {
+    rename = true
+    options = {
+        merge_vars: true,
+    }
+    input: {
+        function f(a) {
+            (function*(b = console.log(a)) {})();
+            var yield = 42..toString();
+            console.log(yield);
+        }
+        f("PASS");
+    }
+    expect: {
+        function f(b) {
+            (function*(c = console.log(b)) {})();
+            var b = 42..toString();
+            console.log(b);
+        }
+        f("PASS");
+    }
+    expect_stdout: [
+        "PASS",
+        "42",
+    ]
+    node_version: ">=6"
+}
+
 issue_4618: {
     options = {
         functions: true,