From 41310e6404951cf9be119cb7cb478be73a98300d Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Mon, 9 Nov 2020 02:47:02 +0000
Subject: [PATCH] fix corner case in `objects` (#4270)

fixes #4269
---
 lib/compress.js          |  11 +++--
 test/compress/objects.js | 104 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/lib/compress.js b/lib/compress.js
index 87e26f88..ef775b9e 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -9407,13 +9407,16 @@ merge(Compressor.prototype, {
 
     OPT(AST_Object, function(self, compressor) {
         if (!compressor.option("objects") || compressor.has_directive("use strict")) return self;
+        for (var i = self.properties.length; --i >= 0;) {
+            var prop = self.properties[i];
+            var key = prop.key;
+            if (key instanceof AST_Node) key = key.evaluate(compressor);
+            if (typeof key != "string" || /[0-9]+/.test(key)) break;
+            if (key !== prop.key) prop.key = "" + key;
+        }
         var keys = new Dictionary();
         var values = [];
         self.properties.forEach(function(prop) {
-            if (prop.key instanceof AST_Node) {
-                var key = prop.key.evaluate(compressor);
-                if (key !== prop.key) prop.key = "" + key;
-            }
             if (prop instanceof AST_ObjectKeyVal && typeof prop.key == "string") {
                 if (prop.value.has_side_effects(compressor)) flush();
                 keys.add(prop.key, prop.value);
diff --git a/test/compress/objects.js b/test/compress/objects.js
index 3fb6ec04..51b7bcc4 100644
--- a/test/compress/objects.js
+++ b/test/compress/objects.js
@@ -256,3 +256,107 @@ keep_computed_key: {
     expect_stdout: "PASS"
     node_version: ">=4"
 }
+
+issue_4269_1: {
+    options = {
+        evaluate: true,
+        objects: true,
+    }
+    input: {
+        console.log({
+            get 0() {
+                return "FAIL";
+            },
+            [0]: "PASS",
+        }[0]);
+    }
+    expect: {
+        console.log({
+            get 0() {
+                return "FAIL";
+            },
+            [0]: "PASS",
+        }[0]);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+issue_4269_2: {
+    options = {
+        evaluate: true,
+        objects: true,
+    }
+    input: {
+        console.log({
+            get [0]() {
+                return "FAIL";
+            },
+            0: "PASS",
+        }[0]);
+    }
+    expect: {
+        console.log({
+            get [0]() {
+                return "FAIL";
+            },
+            0: "PASS",
+        }[0]);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+issue_4269_3: {
+    options = {
+        evaluate: true,
+        objects: true,
+    }
+    input: {
+        console.log({
+            ["foo"]: "bar",
+            get 42() {
+                return "FAIL";
+            },
+            42: "PASS",
+        }[42]);
+    }
+    expect: {
+        console.log({
+            ["foo"]: "bar",
+            get 42() {
+                return "FAIL";
+            },
+            42: "PASS",
+        }[42]);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+issue_4269_4: {
+    options = {
+        evaluate: true,
+        objects: true,
+    }
+    input: {
+        console.log({
+            get 42() {
+                return "FAIL";
+            },
+            ["foo"]: "bar",
+            42: "PASS",
+        }[42]);
+    }
+    expect: {
+        console.log({
+            get 42() {
+                return "FAIL";
+            },
+            ["foo"]: "bar",
+            42: "PASS",
+        }[42]);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
-- 
2.34.1