From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Tue, 10 Nov 2020 16:06:13 +0000 (+0000)
Subject: fix corner case in `evaluate` (#4272)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=fba27bfb71cd973f76e8d1007edec935f25ace77;p=UglifyJS.git

fix corner case in `evaluate` (#4272)

fixes #4271
---

diff --git a/lib/compress.js b/lib/compress.js
index ef775b9e..f44552aa 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3592,10 +3592,7 @@ merge(Compressor.prototype, {
                         key = key._eval(compressor, ignore_side_effects, cached, depth);
                         if (key === prop.key) return this;
                     }
-                    if (prop.value instanceof AST_Function) {
-                        if (typeof Object.prototype[key] == "function") return this;
-                        continue;
-                    }
+                    if (prop.value instanceof AST_Function && typeof Object.prototype[key] == "function") return this;
                     val[key] = prop.value._eval(compressor, ignore_side_effects, cached, depth);
                     if (val[key] === prop.value) return this;
                 }
diff --git a/test/compress/evaluate.js b/test/compress/evaluate.js
index 9fa65202..46a92ee3 100644
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -3047,3 +3047,30 @@ issue_4214: {
     }
     expect_stdout: "NaN"
 }
+
+issue_4271: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        ({
+            p: null,
+            q: (console.log("foo"), 42),
+            p: function() {}
+        })[console.log("bar"), "p"] && console.log("PASS");
+    }
+    expect: {
+        ({
+            p: null,
+            q: (console.log("foo"), 42),
+            p: function() {}
+        })[console.log("bar"), "p"],
+        console.log("PASS");
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+        "PASS",
+    ]
+}