merge #2391 & #2393

test/compress/drop-unused.js

@@ -1291,7 +1291,6 @@ issue_2063: {
     }
     expect: {
         var a;
-        var a;
     }
 }
 

test/compress/harmony.js

@@ -902,10 +902,10 @@ issue_2349b: {
         evaluate: true,
         inline: true,
         passes: 3,
+        properties: true,
         reduce_vars: true,
         toplevel: true,
         side_effects: true,
-        unsafe: true,
         unsafe_arrows: true,
         unused: true,
     }

test/compress/properties.js

@@ -797,8 +797,8 @@ issue_2208_5: {
 issue_2208_6: {
     options = {
         inline: true,
+        properties: true,
         side_effects: true,
-        unsafe: true,
     }
     input: {
         console.log({
@@ -814,9 +814,11 @@ issue_2208_6: {
 
 issue_2208_7: {
     options = {
+        ecma: 6,
         inline: true,
+        properties: true,
         side_effects: true,
-        unsafe: true,
+        unsafe_arrows: true,
     }
     input: {
         console.log({
@@ -834,9 +836,11 @@ issue_2208_7: {
 
 issue_2208_8: {
     options = {
+        ecma: 6,
         inline: true,
+        properties: true,
         side_effects: true,
-        unsafe: true,
+        unsafe_arrows: true,
     }
     input: {
         console.log({
@@ -856,17 +860,17 @@ issue_2208_8: {
                 return x();
             }
         }.p());
-        console.log(async function() {
+        console.log((async () => {
             return await x();
-        }());
+        })());
     }
 }
 
 issue_2208_9: {
     options = {
         inline: true,
+        properties: true,
         side_effects: true,
-        unsafe: true,
     }
     input: {
         a = 42;

test/compress/template-string.js

@@ -442,7 +442,7 @@ simple_string: {
         console.log({[`foo`]: 1}[`foo`], `hi` == "hi", `world`);
     }
     expect: {
-        console.log({foo: 1}.foo, true, "world");
+        console.log([ 1 ][0], true, "world");
     }
     expect_stdout: "1 true 'world'"
     node_version: ">=4"