From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Wed, 10 Jun 2020 23:37:39 +0000 (+0100)
Subject: fix corner case in `unsafe` `evaluate` (#3989)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e89031f1afda74264c4cd4153032c16ba8d86879;p=UglifyJS.git

fix corner case in `unsafe` `evaluate` (#3989)

fixes #3988
---

diff --git a/lib/compress.js b/lib/compress.js
index 0eaa3a4d..8d8dffa2 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3562,32 +3562,32 @@ merge(Compressor.prototype, {
         var regexp_props = makePredicate("global ignoreCase multiline source");
         def(AST_PropAccess, function(compressor, ignore_side_effects, cached, depth) {
             if (compressor.option("unsafe")) {
+                var val;
+                var exp = this.expression;
+                if (!is_undeclared_ref(exp)) {
+                    val = exp._eval(compressor, ignore_side_effects, cached, depth + 1);
+                    if (val == null || val === exp) return this;
+                }
                 var key = this.property;
                 if (key instanceof AST_Node) {
                     key = key._eval(compressor, ignore_side_effects, cached, depth);
                     if (key === this.property) return this;
                 }
-                var exp = this.expression;
-                var val;
-                if (is_undeclared_ref(exp)) {
+                if (val === undefined) {
                     var static_value = static_values[exp.name];
                     if (!static_value || !static_value[key]) return this;
                     val = global_objs[exp.name];
-                } else {
-                    val = exp._eval(compressor, ignore_side_effects, cached, depth + 1);
-                    if (val == null || val === exp) return this;
-                    if (val instanceof RegExp) {
-                        if (!regexp_props[key]) return this;
-                    } else if (typeof val == "object") {
-                        if (!HOP(val, key)) return this;
-                    } else if (typeof val == "function") switch (key) {
-                      case "name":
-                        return val.node.name ? val.node.name.name : "";
-                      case "length":
-                        return val.node.argnames.length;
-                      default:
-                        return this;
-                    }
+                } else if (val instanceof RegExp) {
+                    if (!regexp_props[key]) return this;
+                } else if (typeof val == "object") {
+                    if (!HOP(val, key)) return this;
+                } else if (typeof val == "function") switch (key) {
+                  case "name":
+                    return val.node.name ? val.node.name.name : "";
+                  case "length":
+                    return val.node.argnames.length;
+                  default:
+                    return this;
                 }
                 return val[key];
             }
diff --git a/test/compress/evaluate.js b/test/compress/evaluate.js
index 0f3a9fd1..da928b3c 100644
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -2735,3 +2735,27 @@ issue_3953: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3988: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        function f(b) {
+            return ("" + (b &= 0))[b && this];
+        }
+        var a = f();
+        console.log(a);
+    }
+    expect: {
+        var a = function(b) {
+            return ("" + (b &= 0))[b && this];
+        }();
+        console.log(a);
+    }
+    expect_stdout: "0"
+}