harmony-v3.1.10

Merge branch 'master' into harmony-v3.1.10
fix keyword shorthand property output for ecma >= 6 (#2493 )
2017-11-19 15:53:22 +08:00 · 2017-11-19 14:34:27 +08:00 · 2017-11-19 13:53:42 +08:00 · 2017-11-18 23:56:33 +08:00 · 2017-11-17 13:46:49 +08:00 · 2017-11-17 01:34:57 +08:00
45 changed files with 5306 additions and 705 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -15,6 +15,8 @@
    UglifyJS alone - without third party tools or libraries.
    Ideally the input should be as small as possible.
    Post a link to a gist if necessary.
+
+    Issues without a reproducible test case will be closed.
 -->

 **The `uglifyjs` CLI command executed or `minify()` options used.**
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ a double dash to prevent input files being used as option arguments:
                                sequences.
    --config-file <file>        Read `minify()` options from JSON file.
    -d, --define <expr>[=value] Global definitions.
-    --ecma <version>            Specifiy ECMAScript release: 5, 6, 7 or 8.
+    --ecma <version>            Specify ECMAScript release: 5, 6, 7 or 8.
    --ie8                       Support non-standard Internet Explorer 8.
                                Equivalent to setting `ie8: true` in `minify()`
                                for `compress`, `mangle` and `output` options.
@@ -219,7 +219,7 @@ to prevent the `require`, `exports` and `$` names from being changed.
 is a separate step, different from variable name mangling.  Pass
 `--mangle-props` to enable it.  It will mangle all properties in the
 input code with the exception of built in DOM properties and properties
-in core javascript classes.  For example:
+in core JavaScript classes.  For example:

 ```javascript
 // example.js
@@ -234,7 +234,7 @@ x.bar_ = 2;
 x["baz_"] = 3;
 console.log(x.calc());
 ```
-Mangle all properties (except for javascript `builtins`):
+Mangle all properties (except for JavaScript `builtins`):
 ```bash
 $ uglifyjs example.js -c -m --mangle-props
 ```
@@ -604,7 +604,7 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 ## Compress options

- `arrows` (default `true`) -- Converts `()=>{return x}` to `()=>x`. Class
+- `arrows` (default: `true`) -- Converts `()=>{return x}` to `()=>x`. Class
  and object literal methods will also be converted to arrow expressions if
  the resultant code is shorter: `m(){return x}` becomes `m:()=>x`.
  This transform requires that the `ecma` compress option is set to `6` or greater.
@@ -622,8 +622,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  `!(a <= b) → a > b` (only when `unsafe_comps`), attempts to negate binary
  nodes, e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc.

- `computed_props` -- default `true`. Transforms constant computed properties
-  into regular ones: `{["computed"]: 1}` is converted into `{computed: 1}`.
+- `computed_props` (default: `true`) -- Transforms constant computed properties
+  into regular ones: `{["computed"]: 1}` is converted to `{computed: 1}`.

 - `conditionals` (default: `true`) -- apply optimizations for `if`-s and conditional
  expressions
@@ -637,7 +637,7 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 - `drop_debugger` (default: `true`) -- remove `debugger;` statements

- `ecma` -- default `5`. Pass `6` or greater to enable `compress` options that
+- `ecma` (default: `5`) -- Pass `6` or greater to enable `compress` options that
  will transform ES5 code into smaller ES6+ equivalent forms.

 - `evaluate` (default: `true`) -- attempt to evaluate constant expressions
@@ -649,6 +649,12 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 - `hoist_funs` (default: `true`) -- hoist function declarations

+- `hoist_props` (default: `false`) -- hoist properties from constant object and
+  array literals into regular variables subject to a set of constraints. For example:
+  `var o={p:1, q:2}; f(o.p, o.q);` is converted to `f(1, 2);`. Note: `hoist_props`
+  works best with `mangle` enabled, the `compress` option `passes` set to `2` or higher,
+  and the `compress` option `toplevel` enabled.
+
 - `hoist_vars` (default: `false`) -- hoist `var` declarations (this is `false`
  by default because it seems to increase the size of the output in general)

@@ -662,6 +668,10 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  compressor from discarding unused function arguments.  You need this
  for code which relies on `Function.length`.

+- `keep_fnames` (default: `false`) -- Pass `true` to prevent the
+  compressor from discarding function names.  Useful for code relying on
+  `Function.prototype.name`. See also: the `keep_fnames` [mangle option](#mangle).
+
 - `keep_infinity` (default: `false`) -- default `false`. Pass `true` to prevent `Infinity` from
  being compressed into `1/0`, which may cause performance issues on Chrome.

@@ -696,6 +706,12 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  Specify `"strict"` to treat `foo.bar` as side-effect-free only when
  `foo` is certain to not throw, i.e. not `null` or `undefined`.

+- `reduce_funcs` (default: `true`) -- Allows single-use functions to be
+  inlined as function expressions when permissible allowing further 
+  optimization.  Enabled by default.  Option depends on `reduce_vars` 
+  being enabled.  Some code runs faster in the Chrome V8 engine if this 
+  option is disabled.  Does not negatively impact other major browsers.
+  
 - `reduce_vars` (default: `true`) -- Improve optimization on variables assigned with and
  used as constant values.

@@ -726,7 +742,9 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  `foo === void 0`.  Note: recommend to set this value to `false` for IE10 and
  earlier versions due to known issues.

- `unsafe_arrows` (default `false`) -- Convert ES5 style anonymous function
+- `unsafe` (default: `false`) -- apply "unsafe" transformations (discussion below)
+
+- `unsafe_arrows` (default: `false`) -- Convert ES5 style anonymous function
  expressions to arrow functions if the function body does not reference `this`.
  Note: it is not always safe to perform this conversion if code relies on the
  the function having a `prototype`, which arrow functions lack.
@@ -739,14 +757,19 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  comparison are switching. Compression only works if both `comparisons` and
  `unsafe_comps` are both set to true.

- `unsafe` (default: `false`) -- apply "unsafe" transformations (discussion below)
-
 - `unsafe_Func` (default: `false`) -- compress and mangle `Function(args, code)`
  when both `args` and `code` are string literals.

 - `unsafe_math` (default: `false`) -- optimize numerical expressions like
  `2 * x * 3` into `6 * x`, which may give imprecise floating point results.

+- `unsafe_methods` (default: false) -- Converts `{ m: function(){} }` to
+  `{ m(){} }`. `ecma` must be set to `6` or greater to enable this transform.
+  If `unsafe_methods` is a RegExp then key/value pairs with keys matching the
+  RegExp will be converted to concise methods.
+  Note: if enabled there is a risk of getting a "`<method name>` is not a
+  constructor" TypeError should any code try to `new` the former function.
+
 - `unsafe_proto` (default: `false`) -- optimize expressions like
  `Array.prototype.slice.call(a)` into `[].slice.call(a)`

@@ -761,17 +784,21 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 ## Mangle options

+- `eval` (default `false`). Pass `true` to mangle names visible in scopes
+  where `eval` or `with` are used.
+
 - `keep_classnames` (default `false`).  Pass `true` to not mangle class names.

+- `keep_fnames` (default `false`).  Pass `true` to not mangle function names.
+  Useful for code relying on `Function.prototype.name`. See also: the `keep_fnames`
+  [compress option](#compress-options).
+
 - `reserved` (default `[]`). Pass an array of identifiers that should be
  excluded from mangling. Example: `["foo", "bar"]`.

 - `toplevel` (default `false`). Pass `true` to mangle names declared in the
  top level scope.

- `eval` (default `false`). Pass `true` to mangle names visible in scopes
-  where `eval` or `with` are used.
-
 - `safari10` (default `false`). Pass `true` to work around the Safari 10 loop
  iterator [bug](https://bugs.webkit.org/show_bug.cgi?id=171041)
  "Cannot declare a let variable twice".
@@ -881,6 +908,9 @@ can pass additional arguments that control the code output:

 - `shebang` (default `true`) -- preserve shebang `#!` in preamble (bash scripts)

+- `webkit` (default `false`) -- enable workarounds for WebKit bugs.
+  PhantomJS users should set this option to `true`.
+
 - `width` (default `80`) -- only takes effect when beautification is on, this
  specifies an (orientative) line width that the beautifier will try to
  obey.  It refers to the width of the line text (excluding indentation).
@@ -1088,7 +1118,7 @@ in total it's a bit more than just using UglifyJS's own parser.
 ### Uglify Fast Minify Mode

 It's not well known, but whitespace removal and symbol mangling accounts
-for 95% of the size reduction in minified code for most javascript - not
+for 95% of the size reduction in minified code for most JavaScript - not
 elaborate code transforms. One can simply disable `compress` to speed up
 Uglify builds by 3 to 4 times. In this fast `mangle`-only mode Uglify has
 comparable minify speeds and gzip sizes to
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -15,7 +15,7 @@ var path = require("path");
 var program = require("commander");
 var UglifyJS = require("../tools/node");

-var skip_keys = [ "cname", "enclosed", "parent_scope", "scope", "thedef", "uses_eval", "uses_with" ];
+var skip_keys = [ "cname", "enclosed", "inlined", "parent_scope", "scope", "thedef", "uses_eval", "uses_with" ];
 var files = {};
 var options = {
    compress: false,
@@ -44,7 +44,7 @@ program.option("-o, --output <file>", "Output file (default STDOUT).");
 program.option("--comments [filter]", "Preserve copyright comments in the output.");
 program.option("--config-file <file>", "Read minify() options from JSON file.");
 program.option("-d, --define <expr>[=value]", "Global definitions.", parse_js("define"));
-program.option("--ecma <version>", "Specifiy ECMAScript release: 5, 6, 7 or 8.");
+program.option("--ecma <version>", "Specify ECMAScript release: 5, 6, 7 or 8.");
 program.option("--ie8", "Support non-standard Internet Explorer 8.");
 program.option("--keep-fnames", "Do not mangle/drop function names. Useful for code relying on Function.prototype.name.");
 program.option("--name-cache <file>", "File to hold mangled name mappings.");
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -389,15 +389,15 @@ var AST_Accessor = DEFNODE("Accessor", null, {
    $documentation: "A setter/getter function.  The `name` property is always null."
 }, AST_Lambda);

-var AST_Function = DEFNODE("Function", null, {
+var AST_Function = DEFNODE("Function", "inlined", {
    $documentation: "A function expression"
 }, AST_Lambda);

-var AST_Arrow = DEFNODE("Arrow", null, {
+var AST_Arrow = DEFNODE("Arrow", "inlined", {
    $documentation: "An ES6 Arrow function ((a) => b)"
 }, AST_Lambda);

-var AST_Defun = DEFNODE("Defun", null, {
+var AST_Defun = DEFNODE("Defun", "inlined", {
    $documentation: "A function definition"
 }, AST_Lambda);

@@ -448,10 +448,8 @@ var AST_TemplateString = DEFNODE("TemplateString", "segments", {
    },
    _walk: function(visitor) {
        return visitor._visit(this, function(){
-            this.segments.forEach(function(seg, i){
-                if (i % 2 !== 0) {
-                    seg._walk(visitor);
-                }
+            this.segments.forEach(function(seg){
+                seg._walk(visitor);
            });
        });
    }
@@ -1042,7 +1040,7 @@ var AST_This = DEFNODE("This", null, {

 var AST_Super = DEFNODE("Super", null, {
    $documentation: "The `super` symbol",
-}, AST_Symbol);
+}, AST_This);

 var AST_Constant = DEFNODE("Constant", null, {
    $documentation: "Base class for all constants",
--- a/lib/compress.js
+++ b/lib/compress.js
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -141,11 +141,9 @@ function minify(files, options) {
        if (options.wrap) {
            toplevel = toplevel.wrap_commonjs(options.wrap);
        }
-        if (timings) timings.scope1 = Date.now();
-        if (options.compress) toplevel.figure_out_scope(options.mangle);
        if (timings) timings.compress = Date.now();
        if (options.compress) toplevel = new Compressor(options.compress).compress(toplevel);
-        if (timings) timings.scope2 = Date.now();
+        if (timings) timings.scope = Date.now();
        if (options.mangle) toplevel.figure_out_scope(options.mangle);
        if (timings) timings.mangle = Date.now();
        if (options.mangle) {
@@ -203,9 +201,9 @@ function minify(files, options) {
        if (timings) {
            timings.end = Date.now();
            result.timings = {
-                parse: 1e-3 * (timings.scope1 - timings.parse),
-                scope: 1e-3 * (timings.compress - timings.scope1 + timings.mangle - timings.scope2),
-                compress: 1e-3 * (timings.scope2 - timings.compress),
+                parse: 1e-3 * (timings.compress - timings.parse),
+                compress: 1e-3 * (timings.scope - timings.compress),
+                scope: 1e-3 * (timings.mangle - timings.scope),
                mangle: 1e-3 * (timings.properties - timings.mangle),
                properties: 1e-3 * (timings.output - timings.properties),
                output: 1e-3 * (timings.end - timings.output),
--- a/lib/output.js
+++ b/lib/output.js
@@ -262,7 +262,7 @@ function OutputStream(options) {
        }
    } : noop;

-    var requireSemicolonChars = makePredicate("( [ + * / - , .");
+    var requireSemicolonChars = makePredicate("( [ + * / - , . `");

    function print(str) {
        str = String(str);
@@ -1361,6 +1361,7 @@ function OutputStream(options) {
            self.exported_value.print(output);
        } else if (self.exported_definition) {
            self.exported_definition.print(output);
+            if (self.exported_definition instanceof AST_Definitions) return;
        }
        if (self.module_name) {
            output.space();
@@ -1623,7 +1624,8 @@ function OutputStream(options) {
        if (allowShortHand &&
            self.value instanceof AST_Symbol &&
            is_identifier_string(self.key) &&
-            get_name(self.value) === self.key
+            get_name(self.value) === self.key &&
+            is_identifier(self.key)
        ) {
            print_property_name(self.key, self.quote, output);

@@ -1685,9 +1687,6 @@ function OutputStream(options) {
    DEFPRINT(AST_Symbol, function (self, output) {
        self._do_print(output);
    });
-    DEFPRINT(AST_SymbolDeclaration, function(self, output){
-        self._do_print(output);
-    });
    DEFPRINT(AST_Hole, noop);
    DEFPRINT(AST_This, function(self, output){
        output.print("this");
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -2107,7 +2107,8 @@ function parse($TEXT, options) {
        }));
        while (S.token.end === false) {
            next();
-            segments.push(expression());
+            handle_regexp();
+            segments.push(expression(true));

            if (!is_token("template_substitution")) {
                unexpected();
@@ -2565,7 +2566,7 @@ function parse($TEXT, options) {
                unexpected(tmp);
            }
          case "name":
-            if (tmp.value == "yield" && !is_token(peek(), "punc", ":")
+            if (tmp.value == "yield" && !is_token(peek(), "punc", ":") && !is_token(peek(), "punc", "(")
                && S.input.has_directive("use strict") && !is_in_generator()) {
                token_error(tmp, "Unexpected yield identifier inside strict mode");
            }
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -46,8 +46,10 @@
 function SymbolDef(scope, index, orig) {
    this.name = orig.name;
    this.orig = [ orig ];
+    this.eliminated = 0;
    this.scope = scope;
    this.references = [];
+    this.replaced = 0;
    this.global = false;
    this.export = false;
    this.mangled_name = null;
--- a/lib/transform.js
+++ b/lib/transform.js
@@ -262,11 +262,7 @@ TreeTransformer.prototype = new TreeWalker;
    });

    _(AST_TemplateString, function(self, tw) {
-        for (var i = 0; i < self.segments.length; i++) {
-            if (!(self.segments[i] instanceof AST_TemplateSegment)) {
-                self.segments[i] = self.segments[i].transform(tw);
-            }
-        }
+        self.segments = do_list(self.segments, tw);
    });

    _(AST_PrefixedTemplateString, function(self, tw) {
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "homepage": "https://github.com/mishoo/UglifyJS2/tree/harmony",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.1.4",
+  "version": "3.1.10",
  "engines": {
    "node": ">=0.8.0"
  },
--- a/test/compress/arrays.js
+++ b/test/compress/arrays.js
@@ -203,50 +203,114 @@ constant_join_3: {

 for_loop: {
    options = {
-        unsafe      : true,
-        unused      : true,
-        evaluate    : true,
-        reduce_vars : true
+        evaluate: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unsafe: true,
+        unused: true,
    };
    input: {
        function f0() {
            var a = [1, 2, 3];
-            for (var i = 0; i < a.length; i++) {
-                console.log(a[i]);
-            }
+            var b = 0;
+            for (var i = 0; i < a.length; i++)
+                b += a[i];
+            return b;
        }
-
        function f1() {
            var a = [1, 2, 3];
-            for (var i = 0, len = a.length; i < len; i++) {
-                console.log(a[i]);
-            }
+            var b = 0;
+            for (var i = 0, len = a.length; i < len; i++)
+                b += a[i];
+            return b;
        }
-
-        function f2() {
-            var a = [1, 2, 3];
-            for (var i = 0; i < a.length; i++) {
-                a[i]++;
-            }
-        }
-    }
-    expect: {
-        function f0() {
-            var a = [1, 2, 3];
-            for (var i = 0; i < 3; i++)
-                console.log(a[i]);
-        }
-
-        function f1() {
-            var a = [1, 2, 3];
-            for (var i = 0; i < 3; i++)
-                console.log(a[i]);
-        }
-
        function f2() {
            var a = [1, 2, 3];
            for (var i = 0; i < a.length; i++)
                a[i]++;
+            return a[2];
        }
+        console.log(f0(), f1(), f2());
    }
+    expect: {
+        function f0() {
+            var a = [1, 2, 3];
+            var b = 0;
+            for (var i = 0; i < 3; i++)
+                b += a[i];
+            return b;
+        }
+        function f1() {
+            var a = [1, 2, 3];
+            var b = 0;
+            for (var i = 0; i < 3; i++)
+                b += a[i];
+            return b;
+        }
+        function f2() {
+            var a = [1, 2, 3];
+            for (var i = 0; i < a.length; i++)
+                a[i]++;
+            return a[2];
+        }
+        console.log(f0(), f1(), f2());
+    }
+    expect_stdout: "6 6 4"
+}
+
+index: {
+    options = {
+        evaluate: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var a = [ 1, 2 ];
+        console.log(a[0], a[1]);
+    }
+    expect: {
+        console.log(1, 2);
+    }
+    expect_stdout: "1 2"
+}
+
+length: {
+    options = {
+        evaluate: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var a = [ 1, 2 ];
+        console.log(a.length);
+    }
+    expect: {
+        console.log(2);
+    }
+    expect_stdout: "2"
+}
+
+index_length: {
+    options = {
+        evaluate: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var a = [ 1, 2 ];
+        console.log(a[0], a.length);
+    }
+    expect: {
+        console.log(1, 2);
+    }
+    expect_stdout: "1 2"
 }
--- a/test/compress/arrow.js
+++ b/test/compress/arrow.js
@@ -288,6 +288,7 @@ issue_2105_1: {
        ecma: 6,
        inline: true,
        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unsafe_methods: true,
@@ -314,17 +315,12 @@ issue_2105_1: {
        });
    }
    expect: {
-        (() => {
-            var quux = () => {
+        ({
+            prop() {
+                console.log;
                console.log("PASS");
-            };
-            return {
-                prop() {
-                    console.log;
-                    quux();
-                }
-            };
-        })().prop();
+            }
+        }).prop();
    }
    expect_stdout: "PASS"
    node_version: ">=4"
@@ -335,6 +331,7 @@ issue_2105_2: {
        collapse_vars: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -360,17 +357,12 @@ issue_2105_2: {
        });
    }
    expect: {
-        (() => {
-            var quux = () => {
+        ({
+            prop: () => {
+                console.log;
                console.log("PASS");
-            };
-            return {
-                prop: () => {
-                    console.log;
-                    quux();
-                }
-            };
-        })().prop();
+            }
+        }).prop();
    }
    expect_stdout: "PASS"
    node_version: ">=6"
@@ -411,6 +403,7 @@ issue_2136_3: {
        evaluate: true,
        inline: true,
        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -438,6 +431,7 @@ call_args: {
        ecma: 6,
        evaluate: true,
        inline: true,
+        reduce_funcs: true,
        reduce_vars: true,
    }
    input: {
@@ -462,6 +456,7 @@ call_args_drop_param: {
        evaluate: true,
        inline: true,
        keep_fargs: false,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -509,6 +504,7 @@ issue_2084: {
        evaluate: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -631,3 +627,31 @@ issue_2271: {
    }
    expect_stdout: "PASS"
 }
+
+concise_method_with_super: {
+    options = {
+        arrows: true,
+    }
+    input: {
+        var o = {
+            f: "FAIL",
+            g() {
+                return super.f;
+            }
+        }
+        Object.setPrototypeOf(o, { f: "PASS" });
+        console.log(o.g());
+    }
+    expect: {
+        var o = {
+            f: "FAIL",
+            g() {
+                return super.f;
+            }
+        }
+        Object.setPrototypeOf(o, { f: "PASS" });
+        console.log(o.g());
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
--- a/test/compress/async.js
+++ b/test/compress/async.js
@@ -141,6 +141,7 @@ async_inline: {
        evaluate: true,
        inline: true,
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
--- a/test/compress/comparing.js
+++ b/test/compress/comparing.js
@@ -73,4 +73,42 @@ dont_change_in_or_instanceof_expressions: {
        1 instanceof 1;
        null instanceof null;
    }
-}
+}
+
+self_comparison_1: {
+    options = {
+        comparisons: true,
+    }
+    input: {
+        a === a;
+        a !== b;
+        b.c === a.c;
+        b.c !== b.c;
+    }
+    expect: {
+        a == a;
+        a !== b;
+        b.c === a.c;
+        b.c != b.c;
+    }
+}
+
+self_comparison_2: {
+    options = {
+        comparisons: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        function f() {}
+        var o = {};
+        console.log(f != f, o === o);
+    }
+    expect: {
+        function f() {}
+        var o = {};
+        console.log(false, true);
+    }
+    expect_stdout: "false true"
+}
--- a/test/compress/const.js
+++ b/test/compress/const.js
@@ -12,6 +12,7 @@ issue_1191: {
        join_vars     : true,
        sequences     : false,
        collapse_vars : false,
+        reduce_funcs  : true,
        reduce_vars   : true,
    }
    input: {
@@ -44,6 +45,7 @@ issue_1194: {
        join_vars     : true,
        sequences     : false,
        collapse_vars : false,
+        reduce_funcs  : true,
        reduce_vars   : true,
    }
    input: {
@@ -72,6 +74,7 @@ issue_1396: {
        join_vars     : true,
        sequences     : false,
        collapse_vars : false,
+        reduce_funcs  : true,
        reduce_vars   : true,
    }
    input: {
@@ -143,6 +146,7 @@ regexp_literal_not_const: {
        join_vars     : true,
        sequences     : false,
        collapse_vars : false,
+        reduce_funcs  : true,
        reduce_vars   : true,
    }
    input: {
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -202,6 +202,7 @@ dead_code_const_declaration: {
        booleans     : true,
        conditionals : true,
        evaluate     : true,
+        reduce_funcs : true,
        reduce_vars  : true,
    };
    input: {
@@ -229,6 +230,7 @@ dead_code_const_annotation: {
        booleans     : true,
        conditionals : true,
        evaluate     : true,
+        reduce_funcs : true,
        reduce_vars  : true,
        toplevel     : true,
    };
@@ -281,6 +283,7 @@ dead_code_const_annotation_complex_scope: {
        booleans     : true,
        conditionals : true,
        evaluate     : true,
+        reduce_funcs : true,
        reduce_vars  : true,
        toplevel     : true,
    };
@@ -439,6 +442,7 @@ global_timeout_and_interval_symbols: {
 issue_2233_2: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unsafe: true,
@@ -470,6 +474,7 @@ issue_2233_2: {
 issue_2233_3: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -560,3 +565,64 @@ global_fns: {
        "RangeError",
    ]
 }
+
+issue_2383_1: {
+    options = {
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+    }
+    input: {
+        if (0) {
+            var {x, y} = foo();
+        }
+    }
+    expect: {
+        var x, y;
+    }
+}
+
+issue_2383_2: {
+    options = {
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+    }
+    input: {
+        if (0) {
+            var {
+                x = 0,
+                y: [ w, , { z, p: q = 7 } ] = [ 1, 2, { z: 3 } ]
+            } = {};
+        }
+        console.log(x, q, w, z);
+    }
+    expect: {
+        var x, w, z, q;
+        console.log(x, q, w, z);
+    }
+    expect_stdout: "undefined undefined undefined undefined"
+    node_version: ">=6"
+}
+
+issue_2383_3: {
+    options = {
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+    }
+    input: {
+        var b = 7, y = 8;
+        if (0) {
+            var a = 1, [ x, y, z ] = [ 2, 3, 4 ], b = 5;
+        }
+        console.log(a, x, y, z, b);
+    }
+    expect: {
+        var b = 7, y = 8;
+        var a, x, y, z, b;
+        console.log(a, x, y, z, b);
+    }
+    expect_stdout: "undefined undefined 8 undefined 7"
+    node_version: ">=6"
+}
--- a/test/compress/destructuring.js
+++ b/test/compress/destructuring.js
@@ -262,6 +262,7 @@ destructuring_dont_evaluate_with_undefined_as_default_assignment: {

 reduce_vars: {
    options = {
+        reduce_funcs: true,
        reduce_vars: true,
    }
    input: {
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -733,6 +733,7 @@ drop_value: {
 const_assign: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -785,6 +786,7 @@ issue_1539: {
 vardef_value: {
    options = {
        keep_fnames: false,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -846,6 +848,7 @@ assign_chain: {
 issue_1583: {
    options = {
        keep_fargs: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -1200,6 +1203,7 @@ var_catch_toplevel: {
    options = {
        conditionals: true,
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -1291,15 +1295,15 @@ issue_2063: {
    }
    expect: {
        var a;
-        var a;
    }
 }

-issue_2105: {
+issue_2105_1: {
    options = {
        collapse_vars: true,
        inline: true,
        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -1325,17 +1329,51 @@ issue_2105: {
        });
    }
    expect: {
-        (function() {
-            var quux = function() {
+        ({
+            prop: function() {
+                console.log;
                console.log("PASS");
-            };
-            return {
-                prop: function() {
-                    console.log;
-                    quux();
+            }
+        }).prop();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2105_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        passes: 3,
+        properties: true,
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        !function(factory) {
+            factory();
+        }( function() {
+            return function(fn) {
+                fn()().prop();
+            }( function() {
+                function bar() {
+                    var quux = function() {
+                        console.log("PASS");
+                    }, foo = function() {
+                        console.log;
+                        quux();
+                    };
+                    return { prop: foo };
                }
-            };
-        })().prop();
+                return bar;
+            } );
+        });
+    }
+    expect: {
+        console.log("PASS");
    }
    expect_stdout: "PASS"
 }
@@ -1390,6 +1428,7 @@ issue_2136_3: {
        evaluate: true,
        inline: true,
        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -345,6 +345,7 @@ unsafe_constant: {
 unsafe_object: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -373,6 +374,7 @@ unsafe_object: {
 unsafe_object_nested: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -401,6 +403,7 @@ unsafe_object_nested: {
 unsafe_object_complex: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -429,6 +432,7 @@ unsafe_object_complex: {
 unsafe_object_repeated: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -457,6 +461,7 @@ unsafe_object_repeated: {
 unsafe_object_accessor: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe: true,
    }
@@ -480,10 +485,11 @@ unsafe_object_accessor: {
    }
 }

-unsafe_function: {
+prop_function: {
    options = {
-        evaluate  : true,
-        unsafe    : true
+        evaluate: true,
+        properties: true,
+        side_effects: true,
    }
    input: {
        console.log(
@@ -496,9 +502,9 @@ unsafe_function: {
    expect: {
        console.log(
            ({a:{b:1},b:function(){}}) + 1,
-            ({b:function(){}}, {b:1}) + 1,
-            ({a:{b:1}}, function(){}) + 1,
-            ({b:function(){}}, {b:1}).b + 1
+            ({b:1}) + 1,
+            function(){} + 1,
+            2
        );
    }
    expect_stdout: true
@@ -724,10 +730,11 @@ unsafe_string_bad_index: {
    expect_stdout: true
 }

-unsafe_prototype_function: {
+prototype_function: {
    options = {
-        evaluate  : true,
-        unsafe    : true
+        evaluate: true,
+        properties: true,
+        side_effects: true,
    }
    input: {
        var a = ({valueOf: 0}) < 1;
@@ -746,8 +753,8 @@ unsafe_prototype_function: {
        var d = ({toString: 0}) + "";
        var e = (({valueOf: 0}) + "")[2];
        var f = (({toString: 0}) + "")[2];
-        var g = ({}, 0)();
-        var h = ({}, 0)();
+        var g = 0();
+        var h = 0();
    }
 }

@@ -755,6 +762,7 @@ call_args: {
    options = {
        evaluate: true,
        inline: true,
+        reduce_funcs: true,
        reduce_vars: true,
    }
    input: {
@@ -777,6 +785,7 @@ call_args_drop_param: {
        evaluate: true,
        inline: true,
        keep_fargs: false,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -1107,6 +1116,7 @@ Infinity_NaN_undefined_LHS: {
 issue_1964_1: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe_regexp: false,
        unused: true,
@@ -1136,6 +1146,7 @@ issue_1964_1: {
 issue_1964_2: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe_regexp: true,
        unused: true,
@@ -1288,3 +1299,42 @@ issue_2231_2: {
    }
    expect_stdout: true
 }
+
+self_comparison_1: {
+    options = {
+        evaluate: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var o = { n: NaN };
+        console.log(o.n == o.n, o.n === o.n, o.n != o.n, o.n !== o.n, typeof o.n);
+    }
+    expect: {
+        console.log(false, false, true, true, "number");
+    }
+    expect_stdout: "false false true true 'number'"
+}
+
+self_comparison_2: {
+    options = {
+        evaluate: true,
+        hoist_props: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = { n: NaN };
+        console.log(o.n == o.n, o.n === o.n, o.n != o.n, o.n !== o.n, typeof o.n);
+    }
+    expect: {
+        console.log(false, false, true, true, "number");
+    }
+    expect_stdout: "false false true true 'number'"
+}
--- a/test/compress/export.js
+++ b/test/compress/export.js
@@ -124,6 +124,7 @@ async_func: {
 issue_2134_1: {
    options = {
        keep_fargs: false,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -141,6 +142,7 @@ issue_2134_1: {
 issue_2134_2: {
    options = {
        keep_fargs: false,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -250,3 +252,13 @@ dynamic_import: {
        r.foo();
    }
 }
+
+trailing_comma: {
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        export const a = 1;
+    }
+    expect_exact: "export const a = 1;"
+}
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -19,6 +19,7 @@ iifes_returning_constants_keep_fargs_true: {
        booleans      : true,
        if_return     : true,
        join_vars     : true,
+        reduce_funcs  : true,
        reduce_vars   : true,
        cascade       : true,
        inline        : true,
@@ -55,6 +56,7 @@ iifes_returning_constants_keep_fargs_false: {
        booleans      : true,
        if_return     : true,
        join_vars     : true,
+        reduce_funcs  : true,
        reduce_vars   : true,
        cascade       : true,
        inline        : true,
@@ -101,6 +103,7 @@ issue_1841_1: {
    options = {
        keep_fargs: false,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -127,6 +130,7 @@ issue_1841_2: {
    options = {
        keep_fargs: false,
        pure_getters: false,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -151,13 +155,14 @@ issue_1841_2: {

 function_returning_constant_literal: {
    options = {
-        reduce_vars: true,
-        unsafe: true,
-        toplevel: true,
-        evaluate: true,
-        cascade: true,
-        unused: true,
        inline: true,
+        passes: 2,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
    }
    input: {
        function greeter() {
@@ -305,6 +310,7 @@ issue_2084: {
        evaluate: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -340,6 +346,7 @@ issue_2084: {
 issue_2097: {
    options = {
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -508,3 +515,42 @@ issue_2114_2: {
    }
    expect_stdout: "2"
 }
+
+issue_2428: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        passes: 3,
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        function bar(k) {
+            console.log(k);
+        }
+        function foo(x) {
+            return bar(x);
+        }
+        function baz(a) {
+            foo(a);
+        }
+        baz(42);
+        baz("PASS");
+    }
+    expect: {
+        function baz(a) {
+            console.log(a);
+        }
+        baz(42);
+        baz("PASS");
+    }
+    expect_stdout: [
+        "42",
+        "PASS",
+    ]
+}
--- a/test/compress/harmony.js
+++ b/test/compress/harmony.js
@@ -736,6 +736,7 @@ object_spread_unsafe: {
        evaluate: true,
        join_vars: true,
        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -902,10 +903,11 @@ issue_2349b: {
        evaluate: true,
        inline: true,
        passes: 3,
+        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        side_effects: true,
-        unsafe: true,
        unsafe_arrows: true,
        unused: true,
    }
@@ -935,3 +937,41 @@ issue_2349b: {
    ]
    node_version: ">=7"
 }
+
+shorthand_keywords: {
+    beautify = {
+        ecma: 6,
+    }
+    input: {
+        var foo = 0,
+            async = 1,
+            await = 2,
+            implements = 3,
+            package = 4,
+            private = 5,
+            protected = 6,
+            static = 7,
+            yield = 8;
+        console.log({
+            foo: foo,
+            0: 0,
+            NaN: NaN,
+            async: async,
+            await: await,
+            false: false,
+            implements: implements,
+            null: null,
+            package: package,
+            private: private,
+            protected: protected,
+            static: static,
+            this: this,
+            true: true,
+            undefined: undefined,
+            yield: yield,
+        });
+    }
+    expect_exact: "var foo=0,async=1,await=2,implements=3,package=4,private=5,protected=6,static=7,yield=8;console.log({foo,0:0,NaN:NaN,async,await,false:false,implements:implements,null:null,package:package,private:private,protected:protected,static:static,this:this,true:true,undefined:void 0,yield});"
+    expect_stdout: true
+    node_version: ">=4"
+}
--- a/test/compress/hoist_props.js
+++ b/test/compress/hoist_props.js
@@ -0,0 +1,639 @@
+issue_2377_1: {
+    options = {
+        evaluate: true,
+        inline: true,
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var obj = {
+            foo: 1,
+            bar: 2,
+            square: function(x) {
+                return x * x;
+            },
+            cube: function(x) {
+                return x * x * x;
+            },
+        };
+        console.log(obj.foo, obj.cube(3));
+    }
+    expect: {
+        var obj_foo = 1, obj_cube = function(x) {
+            return x * x * x;
+        };
+        console.log(obj_foo, obj_cube(3));
+    }
+    expect_stdout: "1 27"
+}
+
+issue_2377_2: {
+    options = {
+        evaluate: true,
+        inline: true,
+        hoist_props: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var obj = {
+            foo: 1,
+            bar: 2,
+            square: function(x) {
+                return x * x;
+            },
+            cube: function(x) {
+                return x * x * x;
+            },
+        };
+        console.log(obj.foo, obj.cube(3));
+    }
+    expect: {
+        console.log(1, function(x) {
+            return x * x * x;
+        }(3));
+    }
+    expect_stdout: "1 27"
+}
+
+issue_2377_3: {
+    options = {
+        evaluate: true,
+        inline: true,
+        hoist_props: true,
+        passes: 3,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var obj = {
+            foo: 1,
+            bar: 2,
+            square: function(x) {
+                return x * x;
+            },
+            cube: function(x) {
+                return x * x * x;
+            },
+        };
+        console.log(obj.foo, obj.cube(3));
+    }
+    expect: {
+        console.log(1, 27);
+    }
+    expect_stdout: "1 27"
+}
+
+direct_access_1: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = 0;
+        var obj = {
+            a: 1,
+            b: 2,
+        };
+        for (var k in obj) a++;
+        console.log(a, obj.a);
+    }
+    expect: {
+        var a = 0;
+        var obj = {
+            a: 1,
+            b: 2,
+        };
+        for (var k in obj) a++;
+        console.log(a, obj.a);
+    }
+    expect_stdout: "2 1"
+}
+
+direct_access_2: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = { a: 1 };
+        var f = function(k) {
+            if (o[k]) return "PASS";
+        };
+        console.log(f("a"));
+    }
+    expect: {
+        var o = { a: 1 };
+        console.log(function(k) {
+            if (o[k]) return "PASS";
+        }("a"));
+    }
+    expect_stdout: "PASS"
+}
+
+direct_access_3: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = { a: 1 };
+        o.b;
+        console.log(o.a);
+    }
+    expect: {
+        var o = { a: 1 };
+        o.b;
+        console.log(o.a);
+    }
+    expect_stdout: "1"
+}
+
+single_use: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var obj = {
+            bar: function() {
+                return 42;
+            },
+        };
+        console.log(obj.bar());
+    }
+    expect: {
+        console.log({
+            bar: function() {
+                return 42;
+            },
+        }.bar());
+    }
+}
+
+name_collision_1: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var obj_foo = 1;
+        var obj_bar = 2;
+        function f() {
+            var obj = {
+                foo: 3,
+                bar: 4,
+                "b-r": 5,
+                "b+r": 6,
+                "b!r": 7,
+            };
+            console.log(obj_foo, obj.foo, obj.bar, obj["b-r"], obj["b+r"], obj["b!r"]);
+        }
+        f();
+    }
+    expect: {
+        var obj_foo = 1;
+        var obj_bar = 2;
+        function f() {
+            var obj_foo$0 = 3,
+                obj_bar = 4,
+                obj_b_r = 5,
+                obj_b_r$0 = 6,
+                obj_b_r$1 = 7;
+            console.log(obj_foo, obj_foo$0, obj_bar, obj_b_r, obj_b_r$0, obj_b_r$1);
+        }
+        f();
+    }
+    expect_stdout: "1 3 4 5 6 7"
+}
+
+name_collision_2: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var o = {
+            p: 1,
+            0: function(x) {
+                return x;
+            },
+            1: function(x) {
+                return x + 1;
+            }
+        }, o__$0 = 2, o__$1 = 3;
+        console.log(o.p === o.p, o[0](4), o[1](5), o__$0, o__$1);
+    }
+    expect: {
+        var o_p = 1,
+            o__ = function(x) {
+                return x;
+            },
+            o__$2 = function(x) {
+                return x + 1;
+            },
+            o__$0 = 2,
+            o__$1 = 3;
+        console.log(o_p === o_p, o__(4), o__$2(5), o__$0, o__$1);
+    }
+    expect_stdout: "true 4 6 2 3"
+}
+
+name_collision_3: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var o = {
+            p: 1,
+            0: function(x) {
+                return x;
+            },
+            1: function(x) {
+                return x + 1;
+            }
+        }, o__$0 = 2, o__$1 = 3;
+        console.log(o.p === o.p, o[0](4), o[1](5));
+    }
+    expect: {
+        var o_p = 1,
+            o__ = function(x) {
+                return x;
+            },
+            o__$2 = function(x) {
+                return x + 1;
+            },
+            o__$0 = 2,
+            o__$1 = 3;
+        console.log(o_p === o_p, o__(4), o__$2(5));
+    }
+    expect_stdout: "true 4 6"
+}
+
+contains_this_1: {
+    options = {
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            u: function() {
+                return this === this;
+            },
+            p: 1
+        };
+        console.log(o.p, o.p);
+    }
+    expect: {
+        console.log(1, 1);
+    }
+    expect_stdout: "1 1"
+}
+
+contains_this_2: {
+    options = {
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            u: function() {
+                return this === this;
+            },
+            p: 1
+        };
+        console.log(o.p, o.p, o.u);
+    }
+    expect: {
+        console.log(1, 1, function() {
+            return this === this;
+        });
+    }
+    expect_stdout: true
+}
+
+contains_this_3: {
+    options = {
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            u: function() {
+                return this === this;
+            },
+            p: 1
+        };
+        console.log(o.p, o.p, o.u());
+    }
+    expect: {
+        var o = {
+            u: function() {
+                return this === this;
+            },
+            p: 1
+        };
+        console.log(o.p, o.p, o.u());
+    }
+    expect_stdout: "1 1 true"
+}
+
+hoist_class: {
+    options = {
+        comparisons: true,
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        keep_fnames: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function run(c, v) {
+            return new c(v).value;
+        }
+        var o = {
+            p: class Foo {
+                constructor(value) {
+                    this.value = value * 10;
+                }
+            },
+            x: 1,
+            y: 2,
+        };
+        console.log(o.p.name, o.p === o.p, run(o.p, o.x), run(o.p, o.y));
+    }
+    expect: {
+        function run(c, v) {
+            return new c(v).value;
+        }
+        var o_p = class Foo {
+            constructor(value) {
+                this.value = 10 * value;
+            }
+        };
+        console.log(o_p.name, true, run(o_p, 1), run(o_p, 2));
+    }
+    node_version: ">=6"
+    expect_stdout: "Foo true 10 20"
+}
+
+hoist_class_with_new: {
+    options = {
+        comparisons: true,
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        keep_fnames: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            p: class Foo {
+                constructor(value) {
+                    this.value = value * 10;
+                }
+            },
+            x: 1,
+            y: 2,
+        };
+        console.log(o.p.name, o.p === o.p, new o.p(o.x).value, new o.p(o.y).value);
+    }
+    expect: {
+        // FIXME: class `o.p` not hoisted due to `new`
+        var o = {
+            p: class Foo {
+                constructor(value) {
+                    this.value = 10 * value;
+                }
+            },
+            x: 1,
+            y: 2
+        };
+        console.log(o.p.name, o.p == o.p, new o.p(o.x).value, new o.p(o.y).value);
+    }
+    node_version: ">=6"
+    expect_stdout: "Foo true 10 20"
+}
+
+hoist_function_with_call: {
+    options = {
+        comparisons: true,
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        keep_fnames: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            p: function Foo(value) {
+                return 10 * value;
+            },
+            x: 1,
+            y: 2
+        };
+        console.log(o.p.name, o.p === o.p, o.p(o.x), o.p(o.y));
+    }
+    expect: {
+        var o_p = function Foo(value){
+            return 10 * value
+        };
+        console.log(o_p.name, true, o_p(1), o_p(2));
+    }
+    expect_stdout: "Foo true 10 20"
+}
+
+new_this: {
+    options = {
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+            f: function(a) {
+                this.b = a;
+            }
+        };
+        console.log(new o.f(o.a).b, o.b);
+    }
+    expect: {
+        console.log(new function(a) {
+            this.b = a;
+        }(1).b, 2);
+    }
+    expect_stdout: "1 2"
+}
+
+issue_2462: {
+    options = {
+        hoist_props: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+    }
+    input: {
+        export const Foo = {
+            a: 1,
+            b: () => 2
+        };
+    }
+    expect: {
+        export const Foo = {
+            a: 1,
+            b: () => 2
+        };
+    }
+}
+
+issue_2473_1: {
+    options = {
+        hoist_props: false,
+        reduce_vars: true,
+        top_retain: [ "x", "y" ],
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var x = {};
+        var y = [];
+        var z = {};
+    }
+    expect: {
+        var x = {};
+        var y = [];
+    }
+}
+
+issue_2473_2: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+        top_retain: [ "x", "y" ],
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var x = {};
+        var y = [];
+        var z = {};
+    }
+    expect: {
+        var x = {};
+        var y = [];
+    }
+}
+
+issue_2473_3: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+        top_retain: "o",
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(o.a, o.b);
+    }
+    expect: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(o.a, o.b);
+    }
+    expect_stdout: "1 2"
+}
+
+issue_2473_4: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+        top_retain: "o",
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var o = {
+                a: 1,
+                b: 2,
+            };
+            console.log(o.a, o.b);
+        })();
+    }
+    expect: {
+        (function() {
+            var o_a = 1, o_b = 2;
+            console.log(o_a, o_b);
+        })();
+    }
+    expect_stdout: "1 2"
+}
--- a/test/compress/issue-1041.js
+++ b/test/compress/issue-1041.js
@@ -14,6 +14,7 @@ const_declaration: {
 const_pragma: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
    };

@@ -29,6 +30,7 @@ const_pragma: {
 not_const: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
    };

--- a/test/compress/issue-1609.js
+++ b/test/compress/issue-1609.js
@@ -2,6 +2,7 @@ chained_evaluation_1: {
    options = {
        collapse_vars: true,
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -28,6 +29,7 @@ chained_evaluation_2: {
    options = {
        collapse_vars: true,
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
--- a/test/compress/issue-1656.js
+++ b/test/compress/issue-1656.js
@@ -15,6 +15,7 @@ f7: {
        negate_iife: true,
        passes: 3,
        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
--- a/test/compress/issue-1673.js
+++ b/test/compress/issue-1673.js
@@ -1,5 +1,6 @@
 side_effects_catch: {
    options = {
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -34,6 +35,7 @@ side_effects_catch: {

 side_effects_else: {
    options = {
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -62,6 +64,7 @@ side_effects_else: {

 side_effects_finally: {
    options = {
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -98,6 +101,7 @@ side_effects_finally: {

 side_effects_label: {
    options = {
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -130,6 +134,7 @@ side_effects_label: {

 side_effects_switch: {
    options = {
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
--- a/test/compress/issue-1787.js
+++ b/test/compress/issue-1787.js
@@ -2,6 +2,7 @@ unary_prefix: {
    options = {
        evaluate: true,
        inline: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
--- a/test/compress/issue-1833.js
+++ b/test/compress/issue-1833.js
@@ -1,6 +1,7 @@
 iife_for: {
    options = {
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -26,6 +27,7 @@ iife_for: {
 iife_for_in: {
    options = {
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -51,6 +53,7 @@ iife_for_in: {
 iife_do: {
    options = {
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -80,6 +83,7 @@ iife_do: {
 iife_while: {
    options = {
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
--- a/test/compress/issue-2001.js
+++ b/test/compress/issue-2001.js
@@ -177,6 +177,7 @@ export_mangle_2: {
 export_mangle_3: {
    options = {
        collapse_vars: true,
+        unused: true,
    }
    mangle = {
        toplevel: true,
@@ -195,6 +196,7 @@ export_mangle_3: {
 export_mangle_4: {
    options = {
        collapse_vars: true,
+        unused: true,
    }
    mangle = {
        toplevel: true,
--- a/test/compress/issue-281.js
+++ b/test/compress/issue-281.js
@@ -3,6 +3,7 @@ collapse_vars_constants: {
        collapse_vars: true,
        evaluate: true,
        inline: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -240,6 +241,7 @@ negate_iife_issue_1073: {
        evaluate: true,
        inline: true,
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        unused: true,
@@ -267,6 +269,7 @@ issue_1288_side_effects: {
        evaluate: true,
        inline: true,
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -299,6 +302,7 @@ inner_var_for_in_1: {
    options = {
        evaluate: true,
        inline: true,
+        reduce_funcs: true,
        reduce_vars: true,
    }
    input: {
@@ -330,6 +334,7 @@ issue_1595_3: {
        evaluate: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
--- a/test/compress/issue-973.js
+++ b/test/compress/issue-973.js
@@ -51,6 +51,7 @@ this_binding_collapse_vars: {
    options = {
        collapse_vars: true,
        toplevel: true,
+        unused: true,
    };
    input: {
        var c = a; c();
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -1,7 +1,8 @@
 keep_properties: {
    options = {
-        properties: false
-    };
+        evaluate: true,
+        properties: false,
+    }
    input: {
        a["foo"] = "bar";
    }
@@ -12,6 +13,7 @@ keep_properties: {

 dot_properties: {
    options = {
+        evaluate: true,
        properties: true,
    }
    beautify = {
@@ -37,6 +39,7 @@ dot_properties: {

 dot_properties_es5: {
    options = {
+        evaluate: true,
        properties: true,
    }
    beautify = {
@@ -61,8 +64,8 @@ dot_properties_es5: {
 sub_properties: {
    options = {
        evaluate: true,
-        properties: true
-    };
+        properties: true,
+    }
    input: {
        a[0] = 0;
        a["0"] = 1;
@@ -81,18 +84,18 @@ sub_properties: {
        a[3.14] = 3;
        a.if = 4;
        a["foo bar"] = 5;
-        a[NaN] = 6;
-        a[null] = 7;
+        a.NaN = 6;
+        a.null = 7;
        a[void 0] = 8;
    }
 }

 evaluate_array_length: {
    options = {
+        evaluate: true,
        properties: true,
        unsafe: true,
-        evaluate: true
-    };
+    }
    input: {
        a = [1, 2, 3].length;
        a = [1, 2, 3].join()["len" + "gth"];
@@ -109,10 +112,10 @@ evaluate_array_length: {

 evaluate_string_length: {
    options = {
+        evaluate: true,
        properties: true,
        unsafe: true,
-        evaluate: true
-    };
+    }
    input: {
        a = "foo".length;
        a = ("foo" + "bar")["len" + "gth"];
@@ -151,7 +154,8 @@ mangle_properties: {

 mangle_unquoted_properties: {
    options = {
-        properties: false
+        evaluate: true,
+        properties: false,
    }
    mangle = {
        properties: {
@@ -250,7 +254,8 @@ mangle_debug_suffix: {

 mangle_debug_suffix_keep_quoted: {
    options = {
-        properties: false
+        evaluate: true,
+        properties: false,
    }
    mangle = {
        properties: {
@@ -679,8 +684,8 @@ accessor_this: {
 issue_2208_1: {
    options = {
        inline: true,
+        properties: true,
        side_effects: true,
-        unsafe: true,
    }
    input: {
        console.log({
@@ -698,8 +703,8 @@ issue_2208_1: {
 issue_2208_2: {
    options = {
        inline: true,
+        properties: true,
        side_effects: true,
-        unsafe: true,
    }
    input: {
        console.log({
@@ -723,8 +728,8 @@ issue_2208_2: {
 issue_2208_3: {
    options = {
        inline: true,
+        properties: true,
        side_effects: true,
-        unsafe: true,
    }
    input: {
        a = 42;
@@ -748,8 +753,8 @@ issue_2208_3: {
 issue_2208_4: {
    options = {
        inline: true,
+        properties: true,
        side_effects: true,
-        unsafe: true,
    }
    input: {
        function foo() {}
@@ -772,8 +777,8 @@ issue_2208_4: {
 issue_2208_5: {
    options = {
        inline: true,
+        properties: true,
        side_effects: true,
-        unsafe: true,
    }
    input: {
        console.log({
@@ -792,8 +797,8 @@ issue_2208_5: {
 issue_2208_6: {
    options = {
        inline: true,
+        properties: true,
        side_effects: true,
-        unsafe: true,
    }
    input: {
        console.log({
@@ -809,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({
@@ -829,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({
@@ -851,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;
@@ -931,6 +940,7 @@ methods_keep_quoted_from_dead_code: {
        dead_code: true,
        ecma: 6,
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unsafe_methods: true,
@@ -1052,3 +1062,246 @@ unsafe_methods_regex: {
    ]
    node_version: ">=6"
 }
+
+lhs_prop_1: {
+    options = {
+        evaluate: true,
+        properties: true,
+    }
+    input: {
+        console.log(++{
+            a: 1
+        }.a);
+    }
+    expect: {
+        console.log(++{
+            a: 1
+        }.a);
+    }
+    expect_stdout: "2"
+}
+
+lhs_prop_2: {
+    options = {
+        evaluate: true,
+        inline: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        [1][0] = 42;
+        (function(a) {
+            a.b = "g";
+        })("abc");
+        (function(a) {
+            a[2] = "g";
+        })("def");
+        (function(a) {
+            a[""] = "g";
+        })("ghi");
+    }
+    expect: {
+        [1][0] = 42;
+        "abc".b = "g";
+        "def"[2] = "g";
+        "ghi"[""] = "g";
+    }
+}
+
+literal_duplicate_key_side_effects: {
+    options = {
+        properties: true,
+        side_effects: true,
+    }
+    input: {
+        console.log({
+            a: "FAIL",
+            a: console.log ? "PASS" : "FAIL"
+        }.a);
+    }
+    expect: {
+        console.log(console.log ? "PASS" : "FAIL");
+    }
+    expect_stdout: "PASS"
+}
+
+prop_side_effects_1: {
+    options = {
+        evaluate: true,
+        inline: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var C = 1;
+        console.log(C);
+        var obj = {
+            bar: function() {
+                return C + C;
+            }
+        };
+        console.log(obj.bar());
+    }
+    expect: {
+        console.log(1);
+        var obj = {
+            bar: function() {
+                return 2;
+            }
+        };
+        console.log(obj.bar());
+    }
+    expect_stdout: [
+        "1",
+        "2",
+    ]
+}
+
+prop_side_effects_2: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var C = 1;
+        console.log(C);
+        var obj = {
+            "": function() {
+                return C + C;
+            }
+        };
+        console.log(obj[""]());
+    }
+    expect: {
+        console.log(1);
+        console.log(2);
+    }
+    expect_stdout: [
+        "1",
+        "2",
+    ]
+}
+
+accessor_1: {
+    options = {
+        properties: true,
+    }
+    input: {
+        console.log({
+            a: "FAIL",
+            get a() {
+                return "PASS";
+            }
+        }.a);
+    }
+    expect: {
+        console.log({
+            a: "FAIL",
+            get a() {
+                return "PASS";
+            }
+        }.a);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+accessor_2: {
+    options = {
+        properties: true,
+    }
+    input: {
+        console.log({
+            get a() {
+                return "PASS";
+            },
+            set a(v) {},
+            a: "FAIL"
+        }.a);
+    }
+    expect: {
+        console.log({
+            get a() {
+                return "PASS";
+            },
+            set a(v) {},
+            a: "FAIL"
+        }.a);
+    }
+    expect_stdout: true
+}
+
+array_hole: {
+    options = {
+        properties: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(
+            [ 1, 2, , 3][1],
+            [ 1, 2, , 3][2],
+            [ 1, 2, , 3][3]
+        );
+    }
+    expect: {
+        console.log(2, void 0, 3);
+    }
+    expect_stdout: "2 undefined 3"
+}
+
+computed_property: {
+    options = {
+        properties: true,
+        side_effects: true,
+    }
+    input: {
+        console.log({
+            a: "bar",
+            [console.log("foo")]: 42,
+        }.a);
+    }
+    expect: {
+        console.log([
+            "bar",
+            console.log("foo")
+        ][0]);
+    }
+    expect_stdout: [
+        "foo",
+        "bar"
+    ]
+    node_version: ">=4"
+}
+
+new_this: {
+    options = {
+        properties: true,
+        side_effects: true,
+    }
+    input: {
+        new {
+            f: function(a) {
+                this.a = a;
+            }
+        }.f(42);
+    }
+    expect: {
+        new function(a) {
+            this.a = a;
+        }(42);
+    }
+}
--- a/test/compress/pure_getters.js
+++ b/test/compress/pure_getters.js
@@ -1,6 +1,7 @@
 strict: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: false,
        reduce_vars: false,
        side_effects: true,
        toplevel: true,
@@ -30,6 +31,7 @@ strict: {
 strict_reduce_vars: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -58,6 +60,7 @@ strict_reduce_vars: {
 unsafe: {
    options = {
        pure_getters: true,
+        reduce_funcs: false,
        reduce_vars: false,
        side_effects: true,
        toplevel: true,
@@ -84,6 +87,7 @@ unsafe: {
 unsafe_reduce_vars: {
    options = {
        pure_getters: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -185,6 +189,7 @@ issue_2110_1: {
        pure_getters: "strict",
        sequences: true,
        side_effects: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -215,6 +220,7 @@ issue_2110_2: {
    options = {
        collapse_vars: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -247,6 +253,7 @@ set_immutable_1: {
        collapse_vars: true,
        evaluate: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -270,6 +277,7 @@ set_immutable_2: {
        cascade: true,
        conditionals: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -293,6 +301,7 @@ set_immutable_3: {
        collapse_vars: true,
        evaluate: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -318,6 +327,7 @@ set_immutable_4: {
        cascade: true,
        conditionals: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -343,6 +353,7 @@ set_mutable_1: {
        collapse_vars: true,
        evaluate: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -367,6 +378,7 @@ set_mutable_2: {
        cascade: true,
        conditionals: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -403,6 +415,7 @@ issue_2265_1: {
 issue_2265_2: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -428,6 +441,7 @@ issue_2265_2: {
 issue_2265_3: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -447,6 +461,7 @@ issue_2265_3: {
 issue_2265_4: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
--- a/test/compress/screw-ie8.js
+++ b/test/compress/screw-ie8.js
@@ -187,6 +187,7 @@ dont_screw_try_catch_undefined: {
 reduce_vars: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        ie8: true,
        unused: true,
--- a/test/compress/switch.js
+++ b/test/compress/switch.js
@@ -714,6 +714,7 @@ issue_1705_2: {
    options = {
        dead_code: true,
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
--- a/test/compress/template-string.js
+++ b/test/compress/template-string.js
@@ -59,7 +59,7 @@ template_string_with_constant_expression: {
        var foo = `${4 + 4} equals 4 + 4`;
    }
    expect: {
-        var foo = `8 equals 4 + 4`;
+        var foo = "8 equals 4 + 4";
    }
 }

@@ -89,21 +89,21 @@ template_string_with_predefined_constants: {
        var c = `${4**14}`; // 8 in template vs 9 chars - 268435456
    }
    expect: {
-        var foo = `This is undefined`;
-        var bar = `This is NaN`;
-        var baz = `This is null`;
+        var foo = "This is undefined";
+        var bar = "This is NaN";
+        var baz = "This is null";
        var foofoo = `This is ${1/0}`;
        var foobar = "This is ${1/0}";
        var foobaz = 'This is ${1/0}';
        var barfoo = "This is ${NaN}";
        var bazfoo = "This is ${null}";
        var bazbaz = `This is ${1/0}`;
-        var barbar = `This is NaN`;
+        var barbar = "This is NaN";
        var barbar = "This is ${0/0}";
        var barber = 'This is ${0/0}';

-        var a = `4194304`;
-        var b = `16777216`; // Potential for further concatentation
+        var a = "4194304";
+        var b = "16777216"; // Potential for further concatentation
        var c = `${4**14}`; // Not worth converting
    }
 }
@@ -123,7 +123,7 @@ template_string_evaluate_with_many_segments: {
    }
    expect: {
        var foo = `Hello ${guest()}, welcome to ${location()}.`;
-        var bar = `1234567890`;
+        var bar = "1234567890";
        var baz = `${foobar()}${foobar()}${foobar()}${foobar()}`;
        var buzz = `1${foobar()}2${foobar()}3${foobar()}`;
    }
@@ -159,7 +159,7 @@ template_string_to_normal_string: {
        var bar = "Decimals " + `${1}${2}${3}${4}${5}${6}${7}${8}${9}${0}`;
    }
    expect: {
-        var foo = `This is undefined`;
+        var foo = "This is undefined";
        var bar = "Decimals 1234567890";
    }
 }
@@ -192,7 +192,7 @@ evaluate_nested_templates: {
        var baz = `${`${`${`foo`}`}`}`;
    }
    expect: {
-        var baz = `foo`;
+        var baz = "foo";
    }
 }

@@ -241,8 +241,8 @@ enforce_double_quotes_and_evaluate: {
        var baz = `Hello ${world()}`;
    }
    expect: {
-        var foo = `Hello world`;
-        var bar = `Hello world`;
+        var foo = "Hello world";
+        var bar = "Hello world";
        var baz = `Hello ${world()}`;
    }
 }
@@ -260,8 +260,8 @@ enforce_single_quotes_and_evaluate: {
        var baz = `Hello ${world()}`;
    }
    expect: {
-        var foo = `Hello world`;
-        var bar = `Hello world`;
+        var foo = "Hello world";
+        var bar = "Hello world";
        var baz = `Hello ${world()}`;
    }
 }
@@ -339,7 +339,7 @@ escape_dollar_curly: {
        console.log(`${1-0}\${2-0}$\{3-0}${4-0}`)
        console.log(`$${""}{not an expression}`)
    }
-    expect_exact: "console.log(`\\${ beep }`);console.log(`1\\${2-0}\\${3-0}4`);console.log(`\\${not an expression}`);"
+    expect_exact: 'console.log("${ beep }");console.log("1${2-0}${3-0}4");console.log("${not an expression}");'
 }

 template_starting_with_newline: {
@@ -400,3 +400,109 @@ issue_1856_ascii_only: {
    }
    expect_exact: "console.log(`\\\\n\\\\r\\\\u2028\\\\u2029\\n\\r\\u2028\\u2029`);"
 }
+
+side_effects: {
+    options = {
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        `t1`;
+        tag`t2`;
+        `t${3}`;
+        tag`t${4}`;
+        console.log(`
+t${5}`);
+        function f(a) {
+            `t6${a}`;
+            a = `t7${a}` & a;
+            a = `t8${b}` | a;
+            a = f`t9${a}` ^ a;
+        }
+    }
+    expect: {
+        tag`t2`;
+        tag`t${4}`;
+        console.log("\nt5");
+        function f(a) {
+            a &= `t7${a}`;
+            a = `t8${b}` | a;
+            a = f`t9${a}` ^ a;
+        }
+    }
+}
+
+simple_string: {
+    options = {
+        computed_props: true,
+        evaluate: true,
+        properties: true,
+    }
+    input: {
+        console.log({[`foo`]: 1}[`foo`], `hi` == "hi", `world`);
+    }
+    expect: {
+        console.log([ 1 ][0], true, "world");
+    }
+    expect_stdout: "1 true 'world'"
+    node_version: ">=4"
+}
+
+semicolons: {
+    beautify = {
+        semicolons: false,
+    }
+    input: {
+        foo;
+        `bar`;
+    }
+    expect_exact: "foo;`bar`\n"
+}
+
+regex_1: {
+    input: {
+        console.log(`${/a/} ${6/2} ${/b/.test("b")} ${1?/c/:/d/}`);
+    }
+    expect_exact: 'console.log(`${/a/} ${6/2} ${/b/.test("b")} ${1?/c/:/d/}`);'
+    expect_stdout: "/a/ 3 true /c/"
+    node_version: ">=4"
+}
+
+regex_2: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(`${/a/} ${6/2} ${/b/.test("b")} ${1?/c/:/d/}`);
+    }
+    expect: {
+        console.log("/a/ 3 true /c/");
+    }
+    expect_stdout: "/a/ 3 true /c/"
+    node_version: ">=4"
+}
+
+sequence_1: {
+    input: {
+        console.log(`${1,2} ${/a/,/b/}`);
+    }
+    expect_exact: 'console.log(`${1,2} ${/a/,/b/}`);'
+    expect_stdout: "2 /b/"
+    node_version: ">=4"
+}
+
+sequence_2: {
+    options = {
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(`${1,2} ${/a/,/b/}`);
+    }
+    expect: {
+        console.log("2 /b/");
+    }
+    expect_stdout: "2 /b/"
+    node_version: ">=4"
+}
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -10,7 +10,7 @@ function read(path) {
 describe("bin/uglifyjs", function () {
    var uglifyjscmd = '"' + process.argv[0] + '" bin/uglifyjs';
    it("should produce a functional build when using --self", function (done) {
-        this.timeout(60000);
+        this.timeout(120000);

        var command = uglifyjscmd + ' --self -mc ecma=';
        command += semver.satisfies(process.version, ">=4") ? "6" : "5";
--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -328,4 +328,36 @@ describe("minify", function() {
            });
        });
    });
+
+    describe("collapse_vars", function() {
+        it("Should not produce invalid AST", function() {
+            var code = [
+                "function f(a) {",
+                "    a = x();",
+                "    return a;",
+                "}",
+                "f();",
+            ].join("\n");
+            var ast = Uglify.minify(code, {
+                compress: false,
+                mangle: false,
+                output: {
+                    ast: true
+                },
+            }).ast;
+            assert.strictEqual(ast.TYPE, "Toplevel");
+            assert.strictEqual(ast.body.length, 2);
+            assert.strictEqual(ast.body[0].TYPE, "Defun");
+            assert.strictEqual(ast.body[0].body.length, 2);
+            assert.strictEqual(ast.body[0].body[0].TYPE, "SimpleStatement");
+            var stat = ast.body[0].body[0];
+            Uglify.minify(ast, {
+                compress: {
+                    sequences: false
+                }
+            });
+            assert.ok(stat.body);
+            assert.strictEqual(stat.print_to_string(), "a=x()");
+        });
+    });
 });
--- a/test/mocha/yield.js
+++ b/test/mocha/yield.js
@@ -102,4 +102,15 @@ describe("Yield", function() {
            assert.throws(test(tests[i]), fail, tests[i]);
        }
    });
+
+    it("Should allow yield to be used as class/object property name", function() {
+        var input = [
+            '"use strict";',
+            "({yield:42});",
+            "({yield(){}});",
+            "(class{yield(){}});",
+            "class C{yield(){}}",
+        ].join("");
+        assert.strictEqual(UglifyJS.minify(input, { compress: false }).code, input);
+    });
 });
--- a/test/ufuzz.js
+++ b/test/ufuzz.js
@@ -162,6 +162,7 @@ var VALUES = [
    '"object"',
    '"number"',
    '"function"',
+    'this',
 ];

 var BINARY_OPS_NO_COMMA = [
@@ -349,10 +350,10 @@ function createParams() {
    return params.join(', ');
 }

-function createArgs() {
+function createArgs(recurmax, stmtDepth, canThrow) {
    var args = [];
    for (var n = rng(4); --n >= 0;) {
-        args.push(createValue());
+        args.push(rng(2) ? createValue() : createExpression(recurmax - 1, COMMA_OK, stmtDepth, canThrow));
    }
    return args.join(', ');
 }
@@ -390,9 +391,10 @@ function createFunction(recurmax, inGlobal, noDecl, canThrow, stmtDepth) {

    VAR_NAMES.length = namesLenBefore;

-    if (noDecl) s = 'var ' + createVarName(MANDATORY) + ' = ' + s + '(' + createExpression(recurmax, COMMA_OK, stmtDepth, canThrow) + ');';
+    if (noDecl) s = 'var ' + createVarName(MANDATORY) + ' = ' + s;
    // avoid "function statements" (decl inside statements)
-    else if (inGlobal || rng(10) > 0) s += 'var ' + createVarName(MANDATORY) + ' = ' + name + '(' + createArgs() + ');';
+    else if (inGlobal || rng(10) > 0) s += 'var ' + createVarName(MANDATORY) + ' = ' + name;
+    s += '(' + createArgs(recurmax, stmtDepth, canThrow) + ');';

    return s;
 }
@@ -626,6 +628,9 @@ function _createExpression(recurmax, noComma, stmtDepth, canThrow) {
      case p++:
      case p++:
        return createValue();
+      case p++:
+      case p++:
+        return getVarName();
      case p++:
        return createExpression(recurmax, COMMA_OK, stmtDepth, canThrow);
      case p++:
--- a/test/ufuzz.json
+++ b/test/ufuzz.json
@@ -16,11 +16,9 @@
    {},
    {
        "compress": {
-            "toplevel": true
+            "hoist_props": true
        },
-        "mangle": {
-            "toplevel": true
-        }
+        "toplevel": true
    },
    {
        "compress": {
Author	SHA1	Message	Date
Alex Lam S.L	567cb0e4e3	harmony-v3.1.10	2017-11-19 15:53:22 +08:00
alexlamsl	227b58812d	Merge branch 'master' into harmony-v3.1.10	2017-11-19 14:34:27 +08:00
kzc	f25bd13be6	fix keyword shorthand property output for `ecma` >= 6 (#2493 ) fixes #2491	2017-11-19 13:53:42 +08:00
Alex Lam S.L	667fc4d08b	v3.1.10	2017-11-18 23:56:33 +08:00
kzc	6142117cdd	document the `webkit` output option (#2490 ) - workaround for WebKit bugs - PhantomJS users should enable this output option closes #2489	2017-11-17 13:46:49 +08:00
kzc	e826973b76	fix template expression parse of regex and sequence (#2488 ) fixes #2487	2017-11-17 01:34:57 +08:00
Alex Lam S.L	ae28a24c7f	fix cross-scope inlining of `AST_Function`s (#2486 ) fixes #2485	2017-11-16 10:04:30 +08:00
Alex Lam S.L	ebe761cad0	minor consolidations (#2484 ) - unique symbol generation - `unsafe` on `AST_Call`	2017-11-16 04:37:37 +08:00
kzc	fa7a7c5c5a	Update ISSUE_TEMPLATE.md (#2481 )	2017-11-15 06:00:51 +08:00
kzc	557636f3b7	update documentation for `reduce_funcs` (#2478 )	2017-11-14 16:03:25 +08:00
Alex Lam S.L	49fbe9c5ac	fix replacement logic in `collapse_vars` (#2475 )	2017-11-13 07:37:42 +08:00
Alex Lam S.L	2ac5086831	fix `top_retain` on `hoist_props` (#2474 ) fixes #2473	2017-11-13 00:59:41 +08:00
Alex Lam S.L	c6cfa04d10	allow symbol replacement on multiple occurrences (#2472 ) - all-or-nothing replacement - avoid unmangleable names fixes #2436	2017-11-12 22:31:47 +08:00
Alex Lam S.L	9632f79e46	harmony-v3.1.9	2017-11-11 19:21:09 +08:00
alexlamsl	a3fbb27194	update tests	2017-11-11 15:57:47 +08:00
alexlamsl	11c0b1e1f9	Merge branch 'master' into harmony-v3.1.9	2017-11-11 15:45:34 +08:00
Alex Lam S.L	346fa12e0e	v3.1.9	2017-11-11 15:31:13 +08:00
Alex Lam S.L	cda27b0970	extend `reduce_funcs` to cover cross-scope substitutions (#2469 ) fixes #2468	2017-11-11 15:30:17 +08:00
Alex Lam S.L	3c74047368	implement compress option `reduce_funcs` (#2466 ) - inline single-use function declarations as expressions when permissible - depend on `reduce_vars` - enabled by default - disable for speed critical code fixes #2464	2017-11-11 05:59:35 +08:00
Alex Lam S.L	650d5d5c9b	suppress `hoist_props` on `export` (#2463 ) Miscellaneous - fix double semi-colons from `beautify` in `export` fixes #2462	2017-11-10 17:38:31 +08:00
Alex Lam S.L	94525d859f	fix object literal tracing in `reduce_vars` (#2461 )	2017-11-10 05:47:10 +08:00
Alex Lam S.L	1127a2caf3	fix multiple nested function substitutions (#2458 ) fixes #2449	2017-11-09 23:30:00 +08:00
Alex Lam S.L	246d9d4e83	remove hack in `collapse_vars` (#2457 ) fixes #2456	2017-11-09 20:00:58 +08:00
Alex Lam S.L	4c0b0177b6	preserve function identity in `reduce_vars` (#2451 ) fixes #2450	2017-11-08 03:28:46 +08:00
Alex Lam S.L	dd0a36119b	fix `const` under `collapse_vars` without `unused` (#2454 ) fixes #2453	2017-11-08 02:10:46 +08:00
Alex Lam S.L	94b19a9c46	harmony-v3.1.8	2017-11-07 06:05:40 +08:00
alexlamsl	bcf95ac02c	update tests	2017-11-07 04:49:57 +08:00
alexlamsl	e11cec1ab8	Merge branch 'master' into harmony	2017-11-07 04:30:40 +08:00
Alex Lam S.L	38bfb73f06	v3.1.8	2017-11-07 03:55:16 +08:00
Alex Lam S.L	bbedbf4ea0	handle circular `function` reference gracefully (#2446 ) fixes #2442	2017-11-07 02:37:23 +08:00
Alex Lam S.L	2cfb5aa7da	account for `eval` & `with` in `reduce_vars` (#2441 ) fixes #2440	2017-11-06 16:10:57 +08:00
Alex Lam S.L	6c45101870	consolidate & enhance `unused` (#2439 ) - defer declaration removal in `collapse_vars` - account for `AST_SymbolFunarg` in deduplication - private accounting for `collapse_vars` - avoid issues with identity reference due to deep cloning fixes #2437	2017-11-06 14:25:10 +08:00
Alex Lam S.L	2c2fd89e34	inline single-use functions that are not constant expressions (#2434 ) fixes #2428	2017-11-05 22:14:11 +08:00
Alex Lam S.L	0c43519097	harmony-v3.1.7	2017-11-05 17:25:57 +08:00
alexlamsl	352a7de204	update tests	2017-11-05 16:48:00 +08:00
alexlamsl	df9c8dfd72	Merge branch 'master' into harmony-v3.1.7	2017-11-05 15:47:40 +08:00
Alex Lam S.L	f46281e2b7	v3.1.7	2017-11-05 15:03:19 +08:00
Alex Lam S.L	25a18883f5	tweak #2424 (#2432 )	2017-11-05 12:49:14 +08:00
Alex Lam S.L	5b4b07e9a7	extend function inlining safety checks (#2430 )	2017-11-05 06:18:45 +08:00
Alex Lam S.L	a8aa28a7a6	consolidate single-use `function` reduction (#2427 ) fixes #2423	2017-11-05 04:27:01 +08:00
Alex Lam S.L	fe5a68f9d5	maintain call argument order in `collapse_vars` (#2426 ) fixes #2425	2017-11-05 00:00:18 +08:00
Alex Lam S.L	71e61153b1	improve variations on call arguments for `ufuzz` (#2424 )	2017-11-04 16:29:42 +08:00
Alex Lam S.L	c8b6f4733d	reduce `this` within functions (#2421 ) - only replace same-scope usages - augment `test/ufuzz.js` to test for `this` fixes #2420	2017-11-04 00:31:37 +08:00
kzc	29bbc41dfe	hoist_props: implement limited hoisting of class expressions (#2415 )	2017-10-30 23:20:54 +08:00
Alex Lam S.L	a48f87abf2	compress `new` `function` containing `this` (#2417 )	2017-10-30 23:19:27 +08:00
Alex Lam S.L	d535daa2c7	harmony-v3.1.6	2017-10-29 18:58:58 +08:00
alexlamsl	0a9cdb6c73	handle computed `properties` correctly	2017-10-29 17:46:25 +08:00
alexlamsl	3ae34177a6	merge #2391 & #2393	2017-10-29 17:14:52 +08:00
alexlamsl	086cb33163	Merge branch 'master' into harmony-v3.1.6	2017-10-29 13:23:39 +08:00
Alex Lam S.L	2fd927a7cc	v3.1.6	2017-10-29 12:38:10 +08:00
Alex Lam S.L	8428326ea1	enhance `properties` (#2412 ) - trim array items only if `side_effects` - extend to non-identifier properties	2017-10-29 04:11:26 +08:00
Alex Lam S.L	6371e2ee63	consistently reduce `const` safe literals (#2411 ) fixes #2406	2017-10-28 11:36:44 +08:00
Alex Lam S.L	6ab73c7bd5	fix & improve `AST_TemplateString` (#2410 ) - resolve `semicolons:false` ambiguity with tagged literals - allow `side_effects` to work on template literals - traverse `AST_TemplateString` properly fixes #2401	2017-10-28 11:36:09 +08:00
Alex Lam S.L	31f8209193	remove dead code (#2405 )	2017-10-27 14:28:09 +08:00
Alex Lam S.L	9b0f86f5a1	fix `reduce_vars` on `AST_Array.length` (#2404 )	2017-10-27 02:33:37 +08:00
Alex Lam S.L	ee082ace1b	compress self comparisons (#2398 )	2017-10-26 01:16:12 +08:00
kzc	ae67a49850	document compress option `hoist_props` (#2399 )	2017-10-25 14:03:43 +08:00
Alex Lam S.L	4178289c38	implement `hoist_props` (#2396 ) fixes #2377	2017-10-25 03:38:11 +08:00
Alex Lam S.L	74ae16f9f8	fix `unsafe` `reduce_vars` on arrays & objects (#2397 )	2017-10-24 22:10:36 +08:00
Tom MacWright	1968203d83	docs: Fix spelling and style (#2395 )	2017-10-24 04:59:12 +08:00
Tom MacWright	2848596280	docs: Fix spelling and style (#2395 )	2017-10-24 04:53:56 +08:00
Alex Lam S.L	86ea38a259	enhance `unsafe` `evaluate` of arrays & objects (#2394 )	2017-10-24 02:58:30 +08:00
Alex Lam S.L	8a713e449f	deduplicate declarations regardless of `toplevel` (#2393 )	2017-10-23 01:00:50 +08:00
Alex Lam S.L	7d9a8596a9	fix `dead_code` on `AST_Destructuring` (#2392 ) fixes #2383	2017-10-23 00:34:34 +08:00
Alex Lam S.L	24aa07855b	safer `properties` transform (#2391 ) `{ a: x, b: y }.a` => `[ x, y ][0]` - `x` cannot be function containing `this` `[ x, y, z ][1]` => `(x, z, y)` - only if `z` is side-effect-free	2017-10-22 20:10:13 +08:00
Alex Lam S.L	5fd723f143	fix `unsafe` expansion of object literals (#2390 )	2017-10-22 15:00:36 +08:00
Alex Lam S.L	516eaef50c	fix `unsafe` evaluation of `AST_Sub` (#2389 )	2017-10-22 13:14:15 +08:00
Alex Lam S.L	4ae1fb3ed8	fix `unsafe` evaluation of objects (#2388 )	2017-10-22 04:19:40 +08:00
Alex Lam S.L	011123223b	fix `unsafe` escape analysis in `reduce_vars` (#2387 )	2017-10-22 03:23:31 +08:00
Alex Lam S.L	44352eb26a	harmony-v3.1.5	2017-10-22 01:49:55 +08:00
alexlamsl	9f1c72ae28	update test Sub-optimal result due to block scope.	2017-10-22 00:38:16 +08:00
alexlamsl	c60fa67827	Merge branch 'master' into harmony-v3.1.5	2017-10-22 00:35:00 +08:00
Alex Lam S.L	96439ca246	v3.1.5	2017-10-22 00:27:26 +08:00
Thomas Sauer	f9c57dfee0	Allow 'yield' as method name (#2382 ) fixes #2381	2017-10-21 14:22:39 +08:00
Alex Lam S.L	c927cea632	`unsafe` fix-ups for #2351 (#2379 )	2017-10-21 04:08:26 +08:00
Alex Lam S.L	9f4b98f8e4	backport #2374 (#2376 )	2017-10-19 23:02:27 +08:00
Alex Lam S.L	0f2ef3367c	enhance `collapse_vars` around lazy operations (#2369 )	2017-10-19 04:52:00 +08:00
kzc	6bf5fea008	option formatting in docs (#2374 ) - reintroduce compress documentation for keep_fnames and unsafe_methods - reintroduce keep_fnames in mangle option docs - order compress & mangle options	2017-10-18 05:23:53 +08:00
Alex Lam S.L	7e5b5cac97	fix `AST_PropAccess` in `collapse_vars` (take 3) (#2375 ) Suppress scanning beyond assignment to `a.b`	2017-10-18 02:54:51 +08:00
Alex Lam S.L	c1346e06b7	clean up lazy operator detection (#2373 )	2017-10-17 23:25:45 +08:00
Alex Lam S.L	0d2fe8e3ef	fix `AST_PropAccess` in `collapse_vars` (take 2) (#2372 ) fixes #2364	2017-10-17 22:59:15 +08:00
Alex Lam S.L	f2b9c11e2a	fix `AST_PropAccess` in `collapse_vars` (#2370 ) fixes #2364	2017-10-17 18:33:03 +08:00
Alex Lam S.L	b6a7ca292e	deduplicate `AST_Super` & `AST_This` logic (#2366 )	2017-10-17 04:19:53 +08:00
Alex Lam S.L	fe647b083e	account for side-effects from `AST_This` in `collapse_vars` (#2365 )	2017-10-17 01:18:55 +08:00