v3.2.1

fix dead_code on for (#2552 )
more tests for #2535 (#2551 )
2017-12-03 11:39:51 +08:00 · 2017-12-02 15:46:05 +08:00 · 2017-12-02 02:26:56 +08:00 · 2017-12-02 02:18:33 +08:00 · 2017-12-01 22:41:35 +08:00 · 2017-12-01 14:32:00 +08:00
43 changed files with 3618 additions and 588 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
@@ -598,17 +598,17 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 ## Compress options

- `booleans` (default: `true`) -- various optimizations for boolean context, for example `!!a
-  ? b : c → a ? b : c`
+- `booleans` (default: `true`) -- various optimizations for boolean context,
+  for example `!!a ? b : c → a ? b : c`

- `cascade` (default: `true`) -- small optimization for sequences, transform `x, x` into `x`
-  and `x = something(), x` into `x = something()`
+- `cascade` (default: `true`) -- small optimization for sequences, transform
+  `x, x` into `x` and `x = something(), x` into `x = something()`

- `collapse_vars` (default: `true`) -- Collapse single-use non-constant variables - side
-  effects permitting.
+- `collapse_vars` (default: `true`) -- Collapse single-use non-constant variables,
+  side effects permitting.

- `comparisons` (default: `true`) -- apply certain optimizations to binary nodes, for example:
-  `!(a <= b) → a > b` (only when `unsafe_comps`), attempts to negate binary
+- `comparisons` (default: `true`) -- apply certain optimizations to binary nodes,
+  e.g. `!(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.

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

 - `dead_code` (default: `true`) -- remove unreachable code

- `drop_console` (default: `false`) -- default `false`.  Pass `true` to discard calls to
+- `drop_console` (default: `false`) -- Pass `true` to discard calls to
  `console.*` functions. If you wish to drop a specific function call
  such as `console.info` and/or retain side effects from function arguments
  after dropping the function call then use `pure_funcs` instead.
@@ -625,14 +625,14 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 - `evaluate` (default: `true`) -- attempt to evaluate constant expressions

- `expression` (default: `false`) -- default `false`.  Pass `true` to preserve completion values
+- `expression` (default: `false`) -- Pass `true` to preserve completion values
  from terminal statements without `return`, e.g. in bookmarklets.

 - `global_defs` (default: `{}`) -- see [conditional compilation](#conditional-compilation)

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

- `hoist_props` (default: `false`) -- hoist properties from constant object and
+- `hoist_props` (default: `true`) -- 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,
@@ -647,19 +647,18 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 - `join_vars` (default: `true`) -- join consecutive `var` statements

- `keep_fargs` (default: `true`) -- default `true`.  Prevents the
-  compressor from discarding unused function arguments.  You need this
-  for code which relies on `Function.length`.
+- `keep_fargs` (default: `true`) -- Prevents the 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
+- `keep_infinity` (default: `false`) -- Pass `true` to prevent `Infinity` from
  being compressed into `1/0`, which may cause performance issues on Chrome.

- `loops` (default: `true`) -- optimizations for `do`, `while` and `for` loops when we can
-  statically determine the condition
+- `loops` (default: `true`) -- optimizations for `do`, `while` and `for` loops
+  when we can statically determine the condition.

 - `negate_iife` (default: `true`) -- negate "Immediately-Called Function Expressions"
  where the return value is discarded, to avoid the parens that the
@@ -689,6 +688,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.

@@ -701,21 +706,22 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  occasions the default sequences limit leads to very slow compress times in which
  case a value of `20` or less is recommended.

- `side_effects` (default: `true`) -- default `true`. Pass `false` to disable potentially dropping
+- `side_effects` (default: `true`) -- Pass `false` to disable potentially dropping
  functions marked as "pure".  A function call is marked as "pure" if a comment
  annotation `/*@__PURE__*/` or `/*#__PURE__*/` immediately precedes the call. For
  example: `/*@__PURE__*/foo();`

 - `switches` (default: `true`) -- de-duplicate and remove unreachable `switch` branches

- `toplevel` (default: `false`) -- drop unreferenced functions (`"funcs"`) and/or variables (`"vars"`)
-  in the top level scope (`false` by default, `true` to drop both unreferenced
-  functions and variables)
+- `toplevel` (default: `false`) -- drop unreferenced functions (`"funcs"`) and/or
+  variables (`"vars"`) in the top level scope (`false` by default, `true` to drop
+  both unreferenced functions and variables)

- `top_retain` (default: `null`) -- prevent specific toplevel functions and variables from `unused`
-  removal (can be array, comma-separated, RegExp or function. Implies `toplevel`)
+- `top_retain` (default: `null`) -- prevent specific toplevel functions and
+  variables from `unused` removal (can be array, comma-separated, RegExp or
+  function. Implies `toplevel`)

- `typeofs` (default: `true`) -- default `true`.  Transforms `typeof foo == "undefined"` into
+- `typeofs` (default: `true`) -- Transforms `typeof foo == "undefined"` into
  `foo === void 0`.  Note: recommend to set this value to `false` for IE10 and
  earlier versions due to known issues.

@@ -740,25 +746,25 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `unsafe_regexp` (default: `false`) -- enable substitutions of variables with
  `RegExp` values the same way as if they are constants.

- `unused` (default: `true`) -- drop unreferenced functions and variables (simple direct variable
-  assignments do not count as references unless set to `"keep_assign"`)
+- `unused` (default: `true`) -- drop unreferenced functions and variables (simple
+  direct variable assignments do not count as references unless set to `"keep_assign"`)

- `warnings` (default: `false`) -- display warnings when dropping unreachable code or unused
-  declarations etc.
+- `warnings` (default: `false`) -- display warnings when dropping unreachable
+  code or unused declarations etc.

 ## Mangle options

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

- `keep_fnames` (default `false`).  Pass `true` to not mangle function 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
+- `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
+- `toplevel` (default `false`) -- Pass `true` to mangle names declared in the
  top level scope.

 Examples:
@@ -859,6 +865,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).
--- 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,
@@ -47,6 +47,7 @@ program.option("-d, --define <expr>[=value]", "Global definitions.", parse_js("d
 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.");
+program.option("--no-rename", "Disable symbol expansion.");
 program.option("--self", "Build UglifyJS as a library (implies --wrap UglifyJS)");
 program.option("--source-map [options]", "Enable source map/specify source map options.", parse_source_map());
 program.option("--timings", "Display operations run time on STDERR.")
@@ -65,11 +66,13 @@ if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
    "compress",
    "ie8",
    "mangle",
+    "rename",
    "sourceMap",
    "toplevel",
    "wrap"
 ].forEach(function(name) {
    if (name in program) {
+        if (name == "rename" && program[name]) return;
        options[name] = program[name];
    }
 });
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -352,11 +352,11 @@ 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_Defun = DEFNODE("Defun", null, {
+var AST_Defun = DEFNODE("Defun", "inlined", {
    $documentation: "A function definition"
 }, AST_Lambda);

@@ -898,24 +898,6 @@ TreeWalker.prototype = {
            }
        }
    },
-    in_boolean_context: function() {
-        var stack = this.stack;
-        var i = stack.length, self = stack[--i];
-        while (i > 0) {
-            var p = stack[--i];
-            if ((p instanceof AST_If           && p.condition === self) ||
-                (p instanceof AST_Conditional  && p.condition === self) ||
-                (p instanceof AST_DWLoop       && p.condition === self) ||
-                (p instanceof AST_For          && p.condition === self) ||
-                (p instanceof AST_UnaryPrefix  && p.operator == "!" && p.expression === self))
-            {
-                return true;
-            }
-            if (!(p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")))
-                return false;
-            self = p;
-        }
-    },
    loopcontrol_target: function(node) {
        var stack = this.stack;
        if (node.label) for (var i = stack.length; --i >= 0;) {
--- a/lib/compress.js
+++ b/lib/compress.js
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -55,6 +55,7 @@ function minify(files, options) {
            nameCache: null,
            output: {},
            parse: {},
+            rename: undefined,
            sourceMap: false,
            timings: false,
            toplevel: false,
@@ -64,6 +65,9 @@ function minify(files, options) {
        var timings = options.timings && {
            start: Date.now()
        };
+        if (options.rename === undefined) {
+            options.rename = options.compress && options.mangle;
+        }
        set_shorthand("ie8", options, [ "compress", "mangle", "output" ]);
        set_shorthand("keep_fnames", options, [ "compress", "mangle" ]);
        set_shorthand("toplevel", options, [ "compress", "mangle" ]);
@@ -137,6 +141,11 @@ function minify(files, options) {
        if (options.wrap) {
            toplevel = toplevel.wrap_commonjs(options.wrap);
        }
+        if (timings) timings.rename = Date.now();
+        if (options.rename) {
+            toplevel.figure_out_scope(options.mangle);
+            toplevel.expand_names(options.mangle);
+        }
        if (timings) timings.compress = Date.now();
        if (options.compress) toplevel = new Compressor(options.compress).compress(toplevel);
        if (timings) timings.scope = Date.now();
@@ -197,7 +206,8 @@ function minify(files, options) {
        if (timings) {
            timings.end = Date.now();
            result.timings = {
-                parse: 1e-3 * (timings.compress - timings.parse),
+                parse: 1e-3 * (timings.rename - timings.parse),
+                rename: 1e-3 * (timings.compress - timings.rename),
                compress: 1e-3 * (timings.scope - timings.compress),
                scope: 1e-3 * (timings.mangle - timings.scope),
                mangle: 1e-3 * (timings.properties - timings.mangle),
--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -84,7 +84,7 @@ function reserve_quoted_keys(ast, reserved) {
 function addStrings(node, add) {
    node.walk(new TreeWalker(function(node) {
        if (node instanceof AST_Sequence) {
-            addStrings(node.expressions[node.expressions.length - 1], add);
+            addStrings(node.tail_node(), add);
        } else if (node instanceof AST_String) {
            add(node.value);
        } else if (node instanceof AST_Conditional) {
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -43,15 +43,16 @@

 "use strict";

-function SymbolDef(scope, index, orig) {
+function SymbolDef(scope, orig) {
    this.name = orig.name;
    this.orig = [ orig ];
+    this.eliminated = 0;
    this.scope = scope;
    this.references = [];
+    this.replaced = 0;
    this.global = false;
    this.mangled_name = null;
    this.undeclared = false;
-    this.index = index;
    this.id = SymbolDef.next_id++;
 };

@@ -251,7 +252,7 @@ AST_Toplevel.DEFMETHOD("def_global", function(node){
    if (globals.has(name)) {
        return globals.get(name);
    } else {
-        var g = new SymbolDef(this, globals.size(), node);
+        var g = new SymbolDef(this, node);
        g.undeclared = true;
        g.global = true;
        globals.set(name, g);
@@ -312,7 +313,7 @@ AST_Scope.DEFMETHOD("def_function", function(symbol){
 AST_Scope.DEFMETHOD("def_variable", function(symbol){
    var def;
    if (!this.variables.has(symbol.name)) {
-        def = new SymbolDef(this, this.variables.size(), symbol);
+        def = new SymbolDef(this, symbol);
        this.variables.set(symbol.name, def);
        def.global = !this.parent_scope;
    } else {
@@ -330,7 +331,7 @@ AST_Scope.DEFMETHOD("next_mangled", function(options){

        // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
        // shadow a name reserved from mangling.
-        if (options.reserved.indexOf(m) >= 0) continue;
+        if (member(m, options.reserved)) continue;

        // we must ensure that the mangled name does not shadow a name
        // from some parent scope that is referenced in this or in
@@ -382,7 +383,7 @@ AST_Symbol.DEFMETHOD("global", function(){
    return this.definition().global;
 });

-AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
+AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options) {
    options = defaults(options, {
        eval        : false,
        ie8         : false,
@@ -391,15 +392,14 @@ AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
        toplevel    : false,
    });
    if (!Array.isArray(options.reserved)) options.reserved = [];
+    // Never mangle arguments
+    push_uniq(options.reserved, "arguments");
    return options;
 });

 AST_Toplevel.DEFMETHOD("mangle_names", function(options){
    options = this._default_mangler_options(options);

-    // Never mangle arguments
-    options.reserved.push('arguments');
-
    // We only need to mangle declaration nodes.  Special logic wired
    // into the code generator will display the mangled name if it's
    // present (and for AST_SymbolRef-s it'll use the mangled name of
@@ -408,11 +408,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
    var to_mangle = [];

    if (options.cache) {
-        this.globals.each(function(symbol){
-            if (options.reserved.indexOf(symbol.name) < 0) {
-                to_mangle.push(symbol);
-            }
-        });
+        this.globals.each(collect);
    }

    var tw = new TreeWalker(function(node, descend){
@@ -424,13 +420,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
            return true;        // don't descend again in TreeWalker
        }
        if (node instanceof AST_Scope) {
-            var p = tw.parent(), a = [];
-            node.variables.each(function(symbol){
-                if (options.reserved.indexOf(symbol.name) < 0) {
-                    a.push(symbol);
-                }
-            });
-            to_mangle.push.apply(to_mangle, a);
+            node.variables.each(collect);
            return;
        }
        if (node instanceof AST_Label) {
@@ -450,6 +440,79 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
    if (options.cache) {
        options.cache.cname = this.cname;
    }
+
+    function collect(symbol) {
+        if (!member(symbol.name, options.reserved)) {
+            to_mangle.push(symbol);
+        }
+    }
+});
+
+AST_Toplevel.DEFMETHOD("find_unique_prefix", function(options) {
+    var letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_";
+    var cache = options.cache && options.cache.props;
+    var prefixes = Object.create(null);
+    options.reserved.forEach(add_prefix);
+    this.globals.each(add_def);
+    this.walk(new TreeWalker(function(node) {
+        if (node instanceof AST_Scope) node.variables.each(add_def);
+        if (node instanceof AST_SymbolCatch) add_def(node.definition());
+    }));
+    var prefix, i = 0;
+    do {
+        prefix = create_name(i++);
+    } while (prefixes[prefix]);
+    return prefix;
+
+    function add_prefix(name) {
+        if (/[0-9]$/.test(name)) {
+            prefixes[name.replace(/[0-9]+$/, "")] = true;
+        }
+    }
+
+    function add_def(def) {
+        var name = def.name;
+        if (def.global && cache && cache.has(name)) name = cache.get(name);
+        else if (!def.unmangleable(options)) return;
+        add_prefix(name);
+    }
+
+    function create_name(num) {
+        var name = "";
+        do {
+            name += letters[num % letters.length];
+            num = Math.floor(num / letters.length);
+        } while (num);
+        return name;
+    }
+});
+
+AST_Toplevel.DEFMETHOD("expand_names", function(options) {
+    options = this._default_mangler_options(options);
+    var prefix = this.find_unique_prefix(options);
+    this.globals.each(rename);
+    this.walk(new TreeWalker(function(node) {
+        if (node instanceof AST_Scope) node.variables.each(rename);
+        if (node instanceof AST_SymbolCatch) rename(node.definition());
+    }));
+
+    function rename(def) {
+        if (def.global || def.unmangleable(options)) return;
+        if (member(def.name, options.reserved)) return;
+        var d = def.redefined();
+        def.name = d ? d.name : prefix + def.id;
+        def.orig.forEach(function(sym) {
+            sym.name = def.name;
+        });
+        def.references.forEach(function(sym) {
+            sym.name = def.name;
+        });
+    }
+});
+
+AST_Node.DEFMETHOD("tail_node", return_this);
+AST_Sequence.DEFMETHOD("tail_node", function() {
+    return this.expressions[this.expressions.length - 1];
 });

 AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){
@@ -480,7 +543,7 @@ AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){
            skip_string(node.consequent);
            skip_string(node.alternative);
        } else if (node instanceof AST_Sequence) {
-            skip_string(node.expressions[node.expressions.length - 1]);
+            skip_string(node.tail_node());
        }
    }
 });
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "homepage": "http://lisperator.net/uglifyjs",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.1.8",
+  "version": "3.2.1",
  "engines": {
    "node": ">=0.8.0"
  },
@@ -29,11 +29,11 @@
    "LICENSE"
  ],
  "dependencies": {
-    "commander": "~2.11.0",
+    "commander": "~2.12.1",
    "source-map": "~0.6.1"
  },
  "devDependencies": {
-    "acorn": "~5.1.1",
+    "acorn": "~5.2.1",
    "mocha": "~3.5.1",
    "semver": "~5.4.1"
  },
--- a/test/compress/arrays.js
+++ b/test/compress/arrays.js
@@ -129,6 +129,7 @@ constant_join_3: {
 for_loop: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe: true,
        unused: true,
@@ -185,6 +186,7 @@ for_loop: {
 index: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -203,6 +205,7 @@ index: {
 length: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -221,6 +224,7 @@ length: {
 index_length: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -2,7 +2,8 @@ collapse_vars_side_effects_1: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -150,7 +151,8 @@ collapse_vars_issue_721: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        define(["require", "exports", 'handlebars'], function (require, exports, hb) {
@@ -216,7 +218,8 @@ collapse_vars_properties: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1(obj) {
@@ -243,7 +246,8 @@ collapse_vars_if: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -293,7 +297,8 @@ collapse_vars_while: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:false, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1(y) {
@@ -700,7 +705,7 @@ collapse_vars_lvalues_drop_assign: {
        function f2(x) { var z = x, a = ++z; return z += a; }
        function f3(x) { var a = (x -= 3); return x + a; }
        function f4(x) { var a = (x -= 3); return x + a; }
-        function f5(x) { e1(); var v = e2(), c = v = --x; return x - c; }
+        function f5(x) { e1(), e2(); var c = --x; return x - c; }
        function f6(x) { e1(), e2(); return --x - x; }
        function f7(x) { e1(); return x - (e2() - x); }
        function f8(x) { e1(); return x - (e2() - x); }
@@ -712,7 +717,8 @@ collapse_vars_misc1: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f0(o, a, h) {
@@ -789,7 +795,8 @@ collapse_vars_repeated: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -831,7 +838,8 @@ collapse_vars_closures: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function constant_vars_can_be_replaced_in_any_scope() {
@@ -921,7 +929,8 @@ collapse_vars_try: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -1118,7 +1127,8 @@ collapse_vars_constants: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
+        reduce_funcs: true, reduce_vars:true
    }
    input: {
        function f1(x) {
@@ -1156,7 +1166,7 @@ collapse_vars_arguments: {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
-        toplevel:true, reduce_vars:true
+        toplevel:true, reduce_funcs: true, reduce_vars:true
    }
    input: {
        var outer = function() {
@@ -1280,6 +1290,7 @@ collapse_vars_regexp: {
        hoist_funs:    true,
        keep_fargs:    true,
        loops:         false,
+        reduce_funcs:  true,
        reduce_vars:   true,
        side_effects:  true,
        unused:        true,
@@ -1355,6 +1366,7 @@ issue_1562: {
    options = {
        collapse_vars: true,
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -1611,6 +1623,7 @@ var_side_effects_3: {
 reduce_vars_assign: {
    options = {
        collapse_vars: true,
+        reduce_funcs: true,
        reduce_vars: true,
    }
    input: {
@@ -1633,6 +1646,7 @@ reduce_vars_assign: {
 iife_1: {
    options = {
        collapse_vars: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -1653,6 +1667,7 @@ iife_1: {
 iife_2: {
    options = {
        collapse_vars: true,
+        reduce_funcs: false,
        reduce_vars: false,
        toplevel: true,
        unused: false,
@@ -1998,7 +2013,8 @@ chained_3: {
    }
    expect: {
        console.log(function(a, b) {
-            var c = 1, c = b;
+            var c = 1;
+            c = b;
            b++;
            return c;
        }(0, 2));
@@ -2066,7 +2082,7 @@ inner_lvalues: {
    expect_stdout: true
 }

-double_def: {
+double_def_1: {
    options = {
        collapse_vars: true,
        unused: true,
@@ -2076,8 +2092,23 @@ double_def: {
        a();
    }
    expect: {
-        var a = x;
-        (a = a && y)();
+        var a;
+        (a = (a = x) && y)();
+    }
+}
+
+double_def_2: {
+    options = {
+        collapse_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = x, a = a && y;
+        a();
+    }
+    expect: {
+        (x && y)();
    }
 }

@@ -2105,6 +2136,7 @@ unused_orig: {
    options = {
        collapse_vars: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -2143,6 +2175,7 @@ issue_315: {
        collapse_vars: true,
        evaluate: true,
        keep_fargs: false,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        unused: true,
@@ -2184,7 +2217,7 @@ lvalues_def: {
    }
    expect: {
        var a = 0, b = 1;
-        var a = b++, b = +void 0;
+        a = b++, b = +void 0;
        a && a[a++];
        console.log(a, b);
    }
@@ -2369,6 +2402,8 @@ duplicate_argname: {
 issue_2298: {
    options = {
        collapse_vars: true,
+        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -2734,6 +2769,7 @@ issue_2364_5: {
        evaluate: true,
        pure_getters: true,
        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -3036,6 +3072,8 @@ issue_2437: {
        conditionals: true,
        inline: true,
        join_vars: true,
+        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        sequences: true,
@@ -3052,10 +3090,9 @@ issue_2437: {
                var result = !!req.onreadystatechange;
                Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', xhrDesc || {});
                return result;
-            }
-            else {
+            } else {
                var req = new XMLHttpRequest();
-                var detectFunc = function () { };
+                var detectFunc = function () {};
                req.onreadystatechange = detectFunc;
                var result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
                req.onreadystatechange = null;
@@ -3066,14 +3103,575 @@ issue_2437: {
    }
    expect: {
        !function() {
-            if (xhrDesc)
-                return result = !!(req = new XMLHttpRequest()).onreadystatechange,
-                    Object.defineProperty(XMLHttpRequest.prototype, "onreadystatechange", xhrDesc || {}),
+            if (xhrDesc) {
+                var result = !!(req = new XMLHttpRequest()).onreadystatechange;
+                return Object.defineProperty(XMLHttpRequest.prototype, "onreadystatechange", xhrDesc || {}),
                    result;
-            var req = new XMLHttpRequest(), detectFunc = function() {};
-            req.onreadystatechange = detectFunc;
-            var result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
+            }
+            var req, detectFunc = function() {};
+            (req = new XMLHttpRequest()).onreadystatechange = detectFunc;
+            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
            req.onreadystatechange = null;
        }();
    }
 }
+
+issue_2436_1: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log({
+            x: o.a,
+            y: o.b,
+        });
+    }
+    expect_stdout: true
+}
+
+issue_2436_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            o.a = 3;
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            o.a = 3;
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect_stdout: true
+}
+
+issue_2436_3: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            o = {
+                a: 3,
+                b: 4,
+            };
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            o = {
+                a: 3,
+                b: 4,
+            };
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect_stdout: true
+}
+
+issue_2436_4: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+            var o;
+        }(o));
+    }
+    expect: {
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }({
+            a: 1,
+            b: 2,
+        }));
+    }
+    expect_stdout: true
+}
+
+issue_2436_5: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(o) {
+            return {
+                x: o.a,
+                y: o.b,
+            };
+        }(o));
+    }
+    expect: {
+        console.log(function(o) {
+            return {
+                x: o.a,
+                y: o.b,
+            };
+        }({
+            a: 1,
+            b: 2,
+        }));
+    }
+    expect_stdout: true
+}
+
+issue_2436_6: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+        unsafe: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        console.log({
+            x: 1,
+            y: 2,
+        });
+    }
+    expect_stdout: true
+}
+
+issue_2436_7: {
+    options = {
+        collapse_vars: true,
+        hoist_props: true,
+        inline: true,
+        passes: 3,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        console.log({
+            x: 1,
+            y: 2,
+        });
+    }
+    expect_stdout: true
+}
+
+issue_2436_8: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect_stdout: true
+}
+
+issue_2436_9: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = console;
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect: {
+        var o = console;
+        console.log(function(c) {
+            return {
+                x: c.a,
+                y: c.b,
+            };
+        }(o));
+    }
+    expect_stdout: true
+}
+
+issue_2436_10: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        function f(n) {
+            o = { b: 3 };
+            return n;
+        }
+        console.log(function(c) {
+            return [
+                c.a,
+                f(c.b),
+                c.b,
+            ];
+        }(o).join(" "));
+    }
+    expect: {
+        var o = {
+            a: 1,
+            b: 2,
+        };
+        function f(n) {
+            o = { b: 3 };
+            return n;
+        }
+        console.log(function(c) {
+            return [
+                c.a,
+                f(c.b),
+                c.b,
+            ];
+        }(o).join(" "));
+    }
+    expect_stdout: "1 2 2"
+}
+
+issue_2436_11: {
+    options = {
+        collapse_vars: true,
+        join_vars: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function matrix() {}
+        function isCollection() {}
+        function _randomDataForMatrix() {}
+        function _randomInt() {}
+        function f(arg1, arg2) {
+            if (isCollection(arg1)) {
+                var size = arg1;
+                var max = arg2;
+                var min = 0;
+                var res = _randomDataForMatrix(size.valueOf(), min, max, _randomInt);
+                return size && true === size.isMatrix ? matrix(res) : res;
+            } else {
+                var min = arg1;
+                var max = arg2;
+                return _randomInt(min, max);
+            }
+        }
+    }
+    expect: {
+        function matrix() {}
+        function isCollection() {}
+        function _randomDataForMatrix() {}
+        function _randomInt() {}
+        function f(arg1, arg2) {
+            if (isCollection(arg1)) {
+                var size = arg1, max = arg2, min = 0, res = _randomDataForMatrix(size.valueOf(), min, max, _randomInt);
+                return size && true === size.isMatrix ? matrix(res) : res;
+            } else {
+                return _randomInt(min = arg1, max = arg2);
+            }
+        }
+    }
+}
+
+issue_2436_12: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function isUndefined() {}
+        function f() {
+            var viewValue = this.$$lastCommittedViewValue;
+            var modelValue = viewValue;
+            return isUndefined(modelValue) ? modelValue : null;
+        }
+    }
+    expect: {
+        function isUndefined() {}
+        function f() {
+            var modelValue = this.$$lastCommittedViewValue;
+            return isUndefined(modelValue) ? modelValue : null;
+        }
+    }
+}
+
+issue_2436_13: {
+    options = {
+        collapse_vars: true,
+        passes: 2,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var a = "PASS";
+        (function() {
+            function f(b) {
+                (function g(b) {
+                    var b = b && (b.null = "FAIL");
+                })(a);
+            }
+            f();
+        })();
+        console.log(a);
+    }
+    expect: {
+        var a = "PASS";
+        (function() {
+            (function(b) {
+                (function(b) {
+                    a && (a.null = "FAIL");
+                })();
+            })();
+        })();
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2436_14: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var a = "PASS";
+        var b = {};
+        (function() {
+            var c = a;
+            c && function(c, d) {
+                console.log(c, d);
+            }(b, c);
+        })();
+    }
+    expect: {
+        var a = "PASS";
+        var b = {};
+        (function() {
+            a && function(c, d) {
+                console.log(c, d);
+            }(b, a);
+        })();
+    }
+    expect_stdout: true
+}
+
+issue_2497: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function sample() {
+            if (true) {
+                for (var i = 0; i < 1; ++i) {
+                    for (var k = 0; k < 1; ++k) {
+                        var value = 1;
+                        var x = value;
+                        value = x ? x + 1 : 0;
+                    }
+                }
+            } else {
+                for (var i = 0; i < 1; ++i) {
+                    for (var k = 0; k < 1; ++k) {
+                        var value = 1;
+                    }
+                }
+            }
+        }
+    }
+    expect: {
+        function sample() {
+            if (true)
+                for (var i = 0; i < 1; ++i)
+                    for (var k = 0; k < 1; ++k) {
+                        value = 1;
+                        value = value ? value + 1 : 0;
+                    }
+            else
+                for (i = 0; i < 1; ++i)
+                    for (k = 0; k < 1; ++k)
+                        var value = 1;
+        }
+    }
+}
+
+issue_2506: {
+    options = {
+        collapse_vars: true,
+        passes: 2,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var c = 0;
+        function f0(bar) {
+            function f1(Infinity_2) {
+                function f13(NaN) {
+                    if (false <= NaN & this >> 1 >= 0) {
+                        c++;
+                    }
+                }
+                var b_2 = f13(NaN, c++);
+            }
+            var bar = f1(-3, -1);
+        }
+        f0(false);
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        function f0(bar) {
+            (function(Infinity_2) {
+                (function(NaN) {
+                    if (false <= 0/0 & this >> 1 >= 0)
+                        c++;
+                })(0, c++);
+            })();
+        }
+        f0(false);
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
--- a/test/compress/comparing.js
+++ b/test/compress/comparing.js
@@ -96,6 +96,7 @@ self_comparison_1: {
 self_comparison_2: {
    options = {
        comparisons: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
    }
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -1015,3 +1015,103 @@ delete_conditional_2: {
    }
    expect_stdout: true
 }
+
+issue_2535_1: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        passes: 2,
+        side_effects: true,
+    }
+    input: {
+        if (true || x()) y();
+        if (true && x()) y();
+        if (x() || true) y();
+        if (x() && true) y();
+        if (false || x()) y();
+        if (false && x()) y();
+        if (x() || false) y();
+        if (x() && false) y();
+    }
+    expect: {
+        y();
+        x() && y();
+        (x(), 1) && y();
+        x() && y();
+        x() && y();
+        x() && y();
+        (x(), 0) && y();
+    }
+}
+
+issue_2535_2: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        function x() {}
+        function y() {
+            return "foo";
+        }
+        console.log((x() || true) || y());
+        console.log((y() || true) || x());
+        console.log((x() || true) && y());
+        console.log((y() || true) && x());
+        console.log((x() && true) || y());
+        console.log((y() && true) || x());
+        console.log((x() && true) && y());
+        console.log((y() && true) && x());
+        console.log((x() || false) || y());
+        console.log((y() || false) || x());
+        console.log((x() || false) && y());
+        console.log((y() || false) && x());
+        console.log((x() && false) || y());
+        console.log((y() && false) || x());
+        console.log((x() && false) && y());
+        console.log((y() && false) && x());
+    }
+    expect: {
+        function x() {}
+        function y() {
+            return "foo";
+        }
+        console.log(x() || !0);
+        console.log(y() || !0);
+        console.log((x(), y()));
+        console.log((y(), x()));
+        console.log(!!x() || y());
+        console.log(!!y() || x());
+        console.log(x() && y());
+        console.log(y() && x());
+        console.log(x() || y());
+        console.log(y() || x());
+        console.log(!!x() && y());
+        console.log(!!y() && x());
+        console.log((x(), y()));
+        console.log((y(), x()));
+        console.log(x() && !1);
+        console.log(y() && !1);
+    }
+    expect_stdout: [
+        "true",
+        "foo",
+        "foo",
+        "undefined",
+        "foo",
+        "true",
+        "undefined",
+        "undefined",
+        "foo",
+        "foo",
+        "false",
+        "undefined",
+        "foo",
+        "undefined",
+        "undefined",
+        "false",
+    ]
+}
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -129,8 +129,8 @@ dead_code_constant_boolean_should_warn_more: {
        function bar() {}
        // nothing for the while
        // as for the for, it should keep:
-        var x = 10, y;
        var moo;
+        var x = 10, y;
        bar();
    }
    expect_stdout: true
@@ -165,8 +165,8 @@ dead_code_constant_boolean_should_warn_more_strict: {
        var foo;
        // nothing for the while
        // as for the for, it should keep:
-        var x = 10, y;
        var moo;
+        var x = 10, y;
        bar();
    }
    expect_stdout: true
@@ -178,6 +178,8 @@ try_catch_finally: {
        conditionals: true,
        dead_code: true,
        evaluate: true,
+        passes: 2,
+        side_effects: true,
    }
    input: {
        var a = 1;
@@ -292,6 +294,7 @@ global_timeout_and_interval_symbols: {
 issue_2233_2: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unsafe: true,
@@ -323,6 +326,7 @@ issue_2233_2: {
 issue_2233_3: {
    options = {
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -673,6 +673,7 @@ issue_1539: {
 vardef_value: {
    options = {
        keep_fnames: false,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -734,6 +735,7 @@ assign_chain: {
 issue_1583: {
    options = {
        keep_fargs: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -1080,6 +1082,7 @@ var_catch_toplevel: {
    options = {
        conditionals: true,
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -1113,7 +1116,8 @@ issue_2105_1: {
    options = {
        collapse_vars: true,
        inline: true,
-        passes: 2,
+        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -1153,9 +1157,10 @@ issue_2105_2: {
    options = {
        collapse_vars: true,
        inline: true,
-        passes: 2,
+        passes: 3,
        properties: true,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unsafe: true,
@@ -1289,8 +1294,88 @@ issue_2288: {
    expect: {
        function foo(o) {
            o.a;
-            for (i = 0; i < 0; i++);
            for (var i = 0; i < 0; i++);
+            for (i = 0; i < 0; i++);
        }
    }
 }
+
+issue_2516_1: {
+    options = {
+        collapse_vars: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function foo() {
+            function qux(x) {
+                bar.call(null, x);
+            }
+            function bar(x) {
+                var FOUR = 4;
+                var trouble = x || never_called();
+                var value = (FOUR - 1) * trouble;
+                console.log(value == 6 ? "PASS" : value);
+            }
+            Baz = qux;
+        }
+        var Baz;
+        foo();
+        Baz(2);
+    }
+    expect: {
+        function foo() {
+            Baz = function(x) {
+                (function(x) {
+                    var trouble = x || never_called();
+                    var value = (4 - 1) * trouble;
+                    console.log(6 == value ? "PASS" : value);
+                }).call(null, x);
+            };
+        }
+        var Baz;
+        foo();
+        Baz(2);
+    }
+}
+
+issue_2516_2: {
+    options = {
+        collapse_vars: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        passes: 2,
+        unused: true,
+    }
+    input: {
+        function foo() {
+            function qux(x) {
+                bar.call(null, x);
+            }
+            function bar(x) {
+                var FOUR = 4;
+                var trouble = x || never_called();
+                var value = (FOUR - 1) * trouble;
+                console.log(value == 6 ? "PASS" : value);
+            }
+            Baz = qux;
+        }
+        var Baz;
+        foo();
+        Baz(2);
+    }
+    expect: {
+        function foo() {
+            Baz = function(x) {
+                (function(x) {
+                    var value = (4 - 1) * (x || never_called());
+                    console.log(6 == value ? "PASS" : value);
+                }).call(null, x);
+            };
+        }
+        var Baz;
+        foo();
+        Baz(2);
+    }
+}
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -1,6 +1,7 @@
 and: {
    options = {
-        evaluate: true
+        evaluate: true,
+        side_effects: true,
    }
    input: {
        var a;
@@ -76,7 +77,8 @@ and: {

 or: {
    options = {
-        evaluate: true
+        evaluate: true,
+        side_effects: true,
    }
    input: {
        var a;
@@ -158,7 +160,8 @@ or: {

 unary_prefix: {
    options = {
-        evaluate: true
+        evaluate: true,
+        side_effects: true,
    }
    input: {
        a = !0 && b;
@@ -251,6 +254,7 @@ unsafe_constant: {
 unsafe_object: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -279,6 +283,7 @@ unsafe_object: {
 unsafe_object_nested: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -307,6 +312,7 @@ unsafe_object_nested: {
 unsafe_object_complex: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -335,6 +341,7 @@ unsafe_object_complex: {
 unsafe_object_repeated: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -363,6 +370,7 @@ unsafe_object_repeated: {
 unsafe_object_accessor: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe: true,
    }
@@ -663,6 +671,7 @@ call_args: {
    options = {
        evaluate: true,
        inline: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
    }
@@ -686,6 +695,7 @@ call_args_drop_param: {
        evaluate: true,
        inline: true,
        keep_fargs: false,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -1016,6 +1026,7 @@ Infinity_NaN_undefined_LHS: {
 issue_1964_1: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe_regexp: false,
        unused: true,
@@ -1045,6 +1056,7 @@ issue_1964_1: {
 issue_1964_2: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        unsafe_regexp: true,
        unused: true,
@@ -1201,6 +1213,7 @@ issue_2231_2: {
 self_comparison_1: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unsafe: true,
@@ -1221,6 +1234,7 @@ self_comparison_2: {
        evaluate: true,
        hoist_props: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -1234,3 +1248,95 @@ self_comparison_2: {
    }
    expect_stdout: "false false true true 'number'"
 }
+
+issue_2535_1: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        if ((x() || true) || y()) z();
+        if ((x() || true) && y()) z();
+        if ((x() && true) || y()) z();
+        if ((x() && true) && y()) z();
+        if ((x() || false) || y()) z();
+        if ((x() || false) && y()) z();
+        if ((x() && false) || y()) z();
+        if ((x() && false) && y()) z();
+    }
+    expect: {
+        if (x(), 1) z();
+        if (x(), y()) z();
+        if (x() || y()) z();
+        if (x() && y()) z();
+        if (x() || y()) z();
+        if (x() && y()) z();
+        if (x(), y()) z();
+        if (x(), 0) z();
+    }
+}
+
+issue_2535_2: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        (x() || true) || y();
+        (x() || true) && y();
+        (x() && true) || y();
+        (x() && true) && y();
+        (x() || false) || y();
+        (x() || false) && y();
+        (x() && false) || y();
+        (x() && false) && y();
+    }
+    expect: {
+        x(),
+        x(), y(),
+        x() || y(),
+        x() && y(),
+        x() || y(),
+        x() && y(),
+        x(), y(),
+        x();
+    }
+}
+
+issue_2535_3: {
+    options = {
+        booleans: true,
+        evaluate: true,
+    }
+    input: {
+        console.log(Object(1) && 1 && 2);
+        console.log(Object(1) && true && 1 && 2 && Object(2));
+        console.log(Object(1) && true && 1 && null && 2 && Object(2));
+        console.log(2 == Object(1) || 0 || void 0 || null);
+        console.log(2 == Object(1) || 0 || void 0 || null || Object(2));
+        console.log(2 == Object(1) || 0 || void 0 || "ok" || null || Object(2));
+    }
+    expect: {
+        console.log(Object(1) && 2);
+        console.log(Object(1) && Object(2));
+        console.log(Object(1) && null);
+        console.log(2 == Object(1) || null);
+        console.log(2 == Object(1) || Object(2));
+        console.log(2 == Object(1) || "ok");
+    }
+    expect_stdout: true
+    expect_warnings: [
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1316,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1317,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1318,20]",
+        "WARN: Condition left of && always false [test/compress/evaluate.js:1318,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1319,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1320,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1321,20]",
+        "WARN: Condition left of || always true [test/compress/evaluate.js:1321,20]",
+    ]
+}
--- 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,
@@ -85,6 +87,7 @@ issue_485_crashing_1530: {
        dead_code: true,
        evaluate: true,
        inline: true,
+        side_effects: true,
    }
    input: {
        (function(a) {
@@ -92,15 +95,14 @@ issue_485_crashing_1530: {
            var b = 42;
        })(this);
    }
-    expect: {
-        this, void 0;
-    }
+    expect: {}
 }

 issue_1841_1: {
    options = {
        keep_fargs: false,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -127,6 +129,7 @@ issue_1841_2: {
    options = {
        keep_fargs: false,
        pure_getters: false,
+        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
    }
@@ -154,6 +157,7 @@ function_returning_constant_literal: {
        inline: true,
        passes: 2,
        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -305,6 +309,7 @@ issue_2084: {
        evaluate: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -340,6 +345,7 @@ issue_2084: {
 issue_2097: {
    options = {
        negate_iife: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -513,8 +519,9 @@ issue_2428: {
    options = {
        collapse_vars: true,
        inline: true,
-        passes: 2,
+        passes: 3,
        pure_getters: "strict",
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -546,3 +553,102 @@ issue_2428: {
        "PASS",
    ]
 }
+
+issue_2531_1: {
+    options = {
+        evaluate: true,
+        inline: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function outer() {
+            function inner(value) {
+                function closure() {
+                    return value;
+                }
+                return function() {
+                    return closure();
+                };
+            }
+            return inner("Hello");
+        }
+        console.log("Greeting:", outer()());
+    }
+    expect: {
+        function outer() {
+            return function(value) {
+                return function() {
+                    return value;
+                };
+            }("Hello");
+        }
+        console.log("Greeting:", outer()());
+    }
+    expect_stdout: "Greeting: Hello"
+}
+
+issue_2531_2: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function outer() {
+            function inner(value) {
+                function closure() {
+                    return value;
+                }
+                return function() {
+                    return closure();
+                };
+            }
+            return inner("Hello");
+        }
+        console.log("Greeting:", outer()());
+    }
+    expect: {
+        function outer() {
+            return function() {
+                return "Hello";
+            };
+        }
+        console.log("Greeting:", outer()());
+    }
+    expect_stdout: "Greeting: Hello"
+}
+
+issue_2531_3: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function outer() {
+            function inner(value) {
+                function closure() {
+                    return value;
+                }
+                return function() {
+                    return closure();
+                };
+            }
+            return inner("Hello");
+        }
+        console.log("Greeting:", outer()());
+    }
+    expect: {
+        console.log("Greeting:", "Hello");
+    }
+    expect_stdout: "Greeting: Hello"
+}
--- a/test/compress/global_defs.js
+++ b/test/compress/global_defs.js
@@ -184,6 +184,7 @@ issue_2167: {
        global_defs: {
            "@isDevMode": "function(){}",
        },
+        passes: 2,
        side_effects: true,
    }
    input: {
--- a/test/compress/hoist_props.js
+++ b/test/compress/hoist_props.js
@@ -3,6 +3,7 @@ issue_2377_1: {
        evaluate: true,
        inline: true,
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -35,6 +36,7 @@ issue_2377_2: {
        inline: true,
        hoist_props: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -66,6 +68,7 @@ issue_2377_3: {
        inline: true,
        hoist_props: true,
        passes: 3,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -92,6 +95,7 @@ issue_2377_3: {
 direct_access_1: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -120,6 +124,7 @@ direct_access_1: {
 direct_access_2: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -143,6 +148,7 @@ direct_access_2: {
 direct_access_3: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -163,6 +169,7 @@ direct_access_3: {
 single_use: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -187,6 +194,7 @@ single_use: {
 name_collision_1: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
    }
@@ -224,6 +232,7 @@ name_collision_1: {
 name_collision_2: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
    }
@@ -257,6 +266,7 @@ name_collision_2: {
 name_collision_3: {
    options = {
        hoist_props: true,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
    }
@@ -293,6 +303,7 @@ contains_this_1: {
        hoist_props: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -318,6 +329,7 @@ contains_this_2: {
        hoist_props: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -345,6 +357,7 @@ contains_this_3: {
        hoist_props: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -376,6 +389,7 @@ new_this: {
        hoist_props: true,
        inline: true,
        passes: 2,
+        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
        unused: true,
@@ -397,3 +411,256 @@ new_this: {
    }
    expect_stdout: "1 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"
+}
+
+issue_2508_1: {
+    options = {
+        collapse_vars: true,
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: [ 1 ],
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.a);
+    }
+    expect: {
+        (function(x) {
+            console.log(x);
+        })([ 1 ]);
+    }
+    expect_stdout: true
+}
+
+issue_2508_2: {
+    options = {
+        collapse_vars: true,
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: { b: 2 },
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.a);
+    }
+    expect: {
+        (function(x) {
+            console.log(x);
+        })({ b: 2 });
+    }
+    expect_stdout: true
+}
+
+issue_2508_3: {
+    options = {
+        collapse_vars: true,
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: [ o ],
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.a);
+    }
+    expect: {
+        var o = {
+            a: [ o ],
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.a);
+    }
+    expect_stdout: true
+}
+
+issue_2508_4: {
+    options = {
+        collapse_vars: true,
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            a: { b: o },
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.a);
+    }
+    expect: {
+        var o = {
+            a: { b: o },
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.a);
+    }
+    expect_stdout: true
+}
+
+issue_2508_5: {
+    options = {
+        collapse_vars: true,
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            f: function(x) {
+                console.log(x);
+            }
+        };
+        o.f(o.f);
+    }
+    expect: {
+        var o_f = function(x) {
+            console.log(x);
+        };
+        o_f(o_f);
+    }
+    expect_stdout: true
+}
+
+issue_2519: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        hoist_props: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function testFunc() {
+            var dimensions = {
+                minX: 5,
+                maxX: 6,
+            };
+            var scale = 1;
+            var d = {
+                x: (dimensions.maxX + dimensions.minX) / 2,
+            };
+            return d.x * scale;
+        }
+        console.log(testFunc());
+    }
+    expect: {
+        function testFunc() {
+            return 1 * ((6 + 5) / 2);
+        }
+        console.log(testFunc());
+    }
+    expect_stdout: "5.5"
+}
--- a/test/compress/issue-1041.js
+++ b/test/compress/issue-1041.js
@@ -1,6 +1,7 @@
 const_pragma: {
    options = {
        evaluate: true,
+        reduce_funcs: true,
        reduce_vars: true,
    };

@@ -16,6 +17,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-1639.js
+++ b/test/compress/issue-1639.js
@@ -26,7 +26,7 @@ issue_1639_1: {
    }
    expect: {
        for (var a = 100, b = 10, L1 = 5; --L1 > 0;)
-            if (--b, !1) var ignore = 0;
+            if (--b, 0) var ignore = 0;
        console.log(a, b);
    }
    expect_stdout: true
@@ -57,7 +57,7 @@ issue_1639_2: {
    expect: {
        var a = 100, b = 10;
        function f19() {
-            ++a, 1;
+            ++a, 0;
        }
        f19(),
        console.log(a, b);
--- 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,
@@ -38,7 +39,7 @@ f7: {
        "var b = 10;",
        "",
        "!function() {",
-        "    for (;b = 100, !1; ) ;",
+        "    b = 100;",
        "}(), console.log(100, b);",
    ]
    expect_stdout: 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-1750.js
+++ b/test/compress/issue-1750.js
@@ -7,7 +7,7 @@ case_1: {
    input: {
        var a = 0, b = 1;
        switch (true) {
-          case a, true:
+          case a || true:
          default:
            b = 2;
          case true:
@@ -17,7 +17,7 @@ case_1: {
    expect: {
        var a = 0, b = 1;
        switch (true) {
-          case a, true:
+          case a || true:
            b = 2;
        }
        console.log(a, b);
--- 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,
@@ -130,5 +134,5 @@ label_while: {
            L: while (0) continue L;
        }
    }
-    expect_exact: "function f(){L:;}"
+    expect_exact: "function f(){L:0}"
 }
--- 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-637.js
+++ b/test/compress/issue-637.js
@@ -17,6 +17,6 @@ wrongly_optimized: {
            foo();
        }
        // TODO: optimize to `func(), bar()`
-        (func(), 0) || bar();
+        (func(), 1) && bar();
    }
 }
--- a/test/compress/issue-640.js
+++ b/test/compress/issue-640.js
@@ -100,7 +100,7 @@ wrongly_optimized: {
            foo();
        }
        // TODO: optimize to `func(), bar()`
-        if (func(), !0) bar();
+        if (func(), 1) bar();
    }
 }

--- a/test/compress/issue-973.js
+++ b/test/compress/issue-973.js
@@ -1,7 +1,8 @@
 this_binding_conditionals: {
    options = {
        conditionals: true,
-        evaluate    : true
+        evaluate: true,
+        side_effects: true,
    };
    input: {
        (1 && a)();
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -148,9 +148,11 @@ parse_do_while_without_semicolon: {

 evaluate: {
    options = {
-        loops: true,
        dead_code: true,
        evaluate: true,
+        loops: true,
+        passes: 2,
+        side_effects: true,
    };
    input: {
        while (true) {
@@ -450,3 +452,43 @@ in_parenthesis_2: {
    }
    expect_exact: 'for(function(){"foo"in{}};0;);'
 }
+
+init_side_effects: {
+    options = {
+        loops: true,
+        side_effects: true,
+    };
+    input: {
+        for (function() {}(), i = 0; i < 5; i++) console.log(i);
+        for (function() {}(); i < 10; i++) console.log(i);
+    }
+    expect: {
+        for (i = 0; i < 5; i++) console.log(i);
+        for (; i < 10; i++) console.log(i);
+    }
+    expect_stdout: true
+}
+
+dead_code_condition: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        loops: true,
+        sequences: true,
+    }
+    input: {
+        for (var a = 0, b = 5; (a += 1, 3) - 3 && b > 0; b--) {
+            var c = function() {
+                b--;
+            }(a++);
+        }
+        console.log(a);
+    }
+    expect: {
+        var c;
+        var a = 0, b = 5;
+        a += 1, 0,
+        console.log(a);
+    }
+    expect_stdout: "1"
+}
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -833,6 +833,7 @@ lhs_prop_2: {
        evaluate: true,
        inline: true,
        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -879,6 +880,7 @@ prop_side_effects_1: {
        evaluate: true,
        inline: true,
        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -915,6 +917,7 @@ prop_side_effects_2: {
        inline: true,
        passes: 2,
        properties: true,
+        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
        toplevel: true,
@@ -1025,3 +1028,29 @@ new_this: {
        }(42);
    }
 }
+
+issue_2513: {
+    options = {
+        evaluate: true,
+        properties: true,
+    }
+    input: {
+        !function(Infinity, NaN, undefined) {
+            console.log("a"[1/0], "b"["Infinity"]);
+            console.log("c"[0/0], "d"["NaN"]);
+            console.log("e"[void 0], "f"["undefined"]);
+        }(0, 0, 0);
+    }
+    expect: {
+        !function(Infinity, NaN, undefined) {
+            console.log("a"[1/0], "b"[1/0]);
+            console.log("c".NaN, "d".NaN);
+            console.log("e"[void 0], "f"[void 0]);
+        }(0, 0, 0);
+    }
+    expect_stdout: [
+        "undefined undefined",
+        "undefined undefined",
+        "undefined undefined",
+    ]
+}
--- 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,
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
--- a/test/compress/rename.js
+++ b/test/compress/rename.js
@@ -0,0 +1,536 @@
+mangle_catch: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: false,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var a="FAIL";try{throw 1}catch(o){a="PASS"}console.log(a);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_ie8: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: false,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var a="FAIL";try{throw 1}catch(args){a="PASS"}console.log(a);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_var: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: false,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            var a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var a="FAIL";try{throw 1}catch(o){var a="PASS"}console.log(a);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_var_ie8: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: false,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            var a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var a="FAIL";try{throw 1}catch(args){var a="PASS"}console.log(a);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_toplevel: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: true,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var o="FAIL";try{throw 1}catch(c){o="PASS"}console.log(o);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_ie8_toplevel: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var o="FAIL";try{throw 1}catch(c){o="PASS"}console.log(o);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_var_toplevel: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: true,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            var a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var o="FAIL";try{throw 1}catch(r){var o="PASS"}console.log(o);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_var_ie8_toplevel: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            throw 1;
+        } catch (args) {
+            var a = "PASS";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var o="FAIL";try{throw 1}catch(r){var o="PASS"}console.log(o);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_redef_1: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: false,
+    }
+    input: {
+        var a = "PASS";
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var a="PASS";try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_redef_1_ie8: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: false,
+    }
+    input: {
+        var a = "PASS";
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var a="PASS";try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_redef_1_toplevel: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: true,
+    }
+    input: {
+        var a = "PASS";
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var o="PASS";try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_redef_1_ie8_toplevel: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        var a = "PASS";
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'var o="PASS";try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
+    expect_stdout: "PASS"
+}
+
+mangle_catch_redef_2: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: false,
+    }
+    input: {
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
+    expect_stdout: "undefined"
+}
+
+mangle_catch_redef_2_ie8: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: false,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: false,
+    }
+    input: {
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
+    expect_stdout: "undefined"
+}
+
+mangle_catch_redef_2_toplevel: {
+    rename = true
+    options = {
+        ie8: false,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: false,
+        toplevel: true,
+    }
+    input: {
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
+    expect_stdout: "undefined"
+}
+
+mangle_catch_redef_2_ie8_toplevel: {
+    rename = true
+    options = {
+        ie8: true,
+        toplevel: true,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        try {
+            throw "FAIL1";
+        } catch (a) {
+            var a = "FAIL2";
+        }
+        console.log(a);
+    }
+    expect_exact: 'try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
+    expect_stdout: "undefined"
+}
+
+issue_2120_1: {
+    rename = true
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        "aaaaaaaa";
+        var a = 1, b = "FAIL";
+        try {
+            throw 1;
+        } catch (c) {
+            try {
+                throw 0;
+            } catch (a) {
+                if (c) b = "PASS";
+            }
+        }
+        console.log(b);
+    }
+    expect: {
+        "aaaaaaaa";
+        var a = 1, b = "FAIL";
+        try {
+            throw 1;
+        } catch (t) {
+            try {
+                throw 0;
+            } catch (a) {
+                if (t) b = "PASS";
+            }
+        }
+        console.log(b);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2120_2: {
+    rename = true
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        "aaaaaaaa";
+        var a = 1, b = "FAIL";
+        try {
+            throw 1;
+        } catch (c) {
+            try {
+                throw 0;
+            } catch (a) {
+                if (c) b = "PASS";
+            }
+        }
+        console.log(b);
+    }
+    expect: {
+        "aaaaaaaa";
+        var a = 1, b = "FAIL";
+        try {
+            throw 1;
+        } catch (c) {
+            try {
+                throw 0;
+            } catch (a) {
+                if (c) b = "PASS";
+            }
+        }
+        console.log(b);
+    }
+    expect_stdout: "PASS"
+}
+function_iife_catch: {
+    rename = true
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        function f(n) {
+            !function() {
+                try {
+                    throw 0;
+                } catch (n) {
+                    var a = 1;
+                    console.log(n, a);
+                }
+            }();
+        }
+        f();
+    }
+    expect_exact: "function f(o){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
+    expect_stdout: "0 1"
+}
+
+function_iife_catch_ie8: {
+    rename = true
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        function f(n) {
+            !function() {
+                try {
+                    throw 0;
+                } catch (n) {
+                    var a = 1;
+                    console.log(n, a);
+                }
+            }();
+        }
+        f();
+    }
+    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
+    expect_stdout: "0 1"
+}
+
+function_catch_catch: {
+    rename = true
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        var o = 0;
+        function f() {
+            try {
+                throw 1;
+            } catch (c) {
+                try {
+                    throw 2;
+                } catch (o) {
+                    var o = 3;
+                    console.log(o);
+                }
+            }
+            console.log(o);
+        }
+        f();
+    }
+    expect_exact: "var o=0;function f(){try{throw 1}catch(c){try{throw 2}catch(o){var o=3;console.log(o)}}console.log(o)}f();"
+    expect_stdout: [
+        "3",
+        "undefined",
+    ]
+}
+
+function_catch_catch_ie8: {
+    rename = true
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        var o = 0;
+        function f() {
+            try {
+                throw 1;
+            } catch (c) {
+                try {
+                    throw 2;
+                } catch (o) {
+                    var o = 3;
+                    console.log(o);
+                }
+            }
+            console.log(o);
+        }
+        f();
+    }
+    expect_exact: "var o=0;function f(){try{throw 1}catch(c){try{throw 2}catch(o){var o=3;console.log(o)}}console.log(o)}f();"
+    expect_stdout: [
+        "3",
+        "undefined",
+    ]
+}
--- 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/sequences.js
+++ b/test/compress/sequences.js
@@ -252,13 +252,12 @@ negate_iife_for: {
    input: {
        (function() {})();
        for (i = 0; i < 5; i++) console.log(i);
-
        (function() {})();
-        for (; i < 5; i++) console.log(i);
+        for (; i < 10; i++) console.log(i);
    }
    expect: {
        for (!function() {}(), i = 0; i < 5; i++) console.log(i);
-        for (function() {}(); i < 5; i++) console.log(i);
+        for (!function() {}(); i < 10; i++) console.log(i);
    }
    expect_stdout: 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,
@@ -816,3 +817,50 @@ issue_1758: {
    }
    expect_stdout: "0 3"
 }
+
+issue_2535: {
+    options = {
+        evaluate: true,
+        dead_code: true,
+        switches: true,
+    }
+    input: {
+        switch(w(), 42) {
+            case 13: x();
+            case 42: y();
+            default: z();
+        }
+    }
+    expect: {
+        w(), 42;
+        42;
+        y();
+        z();
+    }
+}
+
+issue_1750: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        switches: true,
+    }
+    input: {
+        var a = 0, b = 1;
+        switch (true) {
+          case a, true:
+          default:
+            b = 2;
+          case true:
+        }
+        console.log(a, b);
+    }
+    expect: {
+        var a = 0, b = 1;
+        true;
+        a, true;
+        b = 2;
+        console.log(a, b);
+    }
+    expect_stdout: "0 2"
+}
--- a/test/compress/transform.js
+++ b/test/compress/transform.js
@@ -45,9 +45,9 @@ condition_evaluate: {
        if (void 0 == null);
    }
    expect: {
-        while (!1);
-        for (; !0;);
-        if (!0);
+        while (0);
+        for (; 1;);
+        if (1);
    }
 }

@@ -68,6 +68,7 @@ label_if_break: {
        conditionals: true,
        dead_code: true,
        evaluate: true,
+        side_effects: true,
    }
    input: {
        L: if (true) {
--- a/test/compress/typeof.js
+++ b/test/compress/typeof.js
@@ -1,6 +1,7 @@
 typeof_evaluation: {
    options = {
-        evaluate: true
+        evaluate: true,
+        typeofs: true,
    };
    input: {
        a = typeof 1;
@@ -44,7 +45,7 @@ typeof_in_boolean_context: {
        function f2() { return g(), "Yes"; }
        foo();
        console.log(1);
-        var a = !(console.log(2), !0);
+        var a = !(console.log(2), 1);
        foo();
    }
 }
@@ -57,6 +58,83 @@ issue_1668: {
        if (typeof bar);
    }
    expect: {
-        if (!0);
+        if (1);
    }
 }
+
+typeof_defun_1: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            console.log("YES");
+        }
+        function g() {
+            h = 42;
+            console.log("NOPE");
+        }
+        function h() {
+            console.log("YUP");
+        }
+        g = 42;
+        "function" == typeof f && f();
+        "function" == typeof g && g();
+        "function" == typeof h && h();
+    }
+    expect: {
+        function g() {
+            h = 42;
+            console.log("NOPE");
+        }
+        function h() {
+            console.log("YUP");
+        }
+        g = 42;
+        console.log("YES");
+        "function" == typeof g && g();
+        h();
+    }
+    expect_stdout: [
+        "YES",
+        "YUP",
+    ]
+}
+
+typeof_defun_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+    }
+    input: {
+        var f = function() {
+            console.log(x);
+        };
+        var x = 0;
+        x++ < 2 && typeof f == "function" && f();
+        x++ < 2 && typeof f == "function" && f();
+        x++ < 2 && typeof f == "function" && f();
+    }
+    expect: {
+        var f = function() {
+            console.log(x);
+        };
+        var x = 0;
+        x++ < 2 && f();
+        x++ < 2 && f();
+        x++ < 2 && f();
+    }
+    expect_stdout: [
+        "1",
+        "2",
+    ]
+}
--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -297,4 +297,37 @@ describe("minify", function() {
            assert.strictEqual(result.code, "alert({bar:42});");
        });
    });
+
+    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
+                },
+                mangle: false
+            });
+            assert.ok(stat.body);
+            assert.strictEqual(stat.print_to_string(), "a=x()");
+        });
+    });
 });
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -117,6 +117,10 @@ function run_compress_tests() {
                test.mangle.properties.reserved = quoted_props;
                U.reserve_quoted_keys(input, quoted_props);
            }
+            if (test.rename) {
+                input.figure_out_scope(test.mangle);
+                input.expand_names(test.mangle);
+            }
            var cmp = new U.Compressor(options, true);
            var output = cmp.compress(input);
            output.figure_out_scope(test.mangle);
Author	SHA1	Message	Date
Alex Lam S.L	b9f3ddfb30	v3.2.1	2017-12-03 11:39:51 +08:00
Alex Lam S.L	77332a0315	fix `dead_code` on `for` (#2552 )	2017-12-02 15:46:05 +08:00
Alex Lam S.L	85c56adbd1	more tests for #2535 (#2551 )	2017-12-02 02:26:56 +08:00
Alex Lam S.L	8da3754e51	improve `evaluate` on `typeof` (#2550 ) - gated through `typeofs`	2017-12-02 02:18:33 +08:00
Alex Lam S.L	9a6b11f8e6	improve boolean compression (#2548 ) fixes #2535	2017-12-01 22:41:35 +08:00
Alex Lam S.L	7ac6fdcc99	improve switch case compression (#2547 )	2017-12-01 14:32:00 +08:00
Alex Lam S.L	f6610baaa8	improve `AST_For.init` & `AST_Switch.expression` compression (#2546 )	2017-12-01 12:53:59 +08:00
Alex Lam S.L	09b320e8a5	convert to number under boolean context (#2545 )	2017-12-01 12:52:36 +08:00
Alex Lam S.L	5a1e99d713	improve compression of `if` conditions (#2544 )	2017-12-01 06:18:31 +08:00
Alex Lam S.L	b762f2d6f4	improve compression of loop conditions (#2543 )	2017-12-01 05:52:33 +08:00
Alex Lam S.L	172079a47f	improve code reuse (#2542 )	2017-12-01 03:40:46 +08:00
Alex Lam S.L	c58d3936a3	fix corner case in call binding (#2541 )	2017-12-01 03:18:20 +08:00
Alex Lam S.L	18302bf8e9	backport test from #2526 (#2534 )	2017-11-29 13:32:00 +08:00
Alex Lam S.L	bc5047c1e7	fix `inline` on nested substitutions (#2533 ) fixes #2531	2017-11-29 13:31:41 +08:00
Alex Lam S.L	206a54a746	fix nested `hoist_props` substitution (#2523 ) fixes #2519	2017-11-28 14:39:00 +08:00
Alex Lam S.L	32def5ebf5	improve synergy between `collapse_vars` & `unused` (#2521 )	2017-11-28 14:02:39 +08:00
Alex Lam S.L	ecc9f6b770	drop assignment in `AST_VarDef.value` (#2522 ) fixes #2516	2017-11-28 13:08:40 +08:00
Alex Lam S.L	b37a68c84f	v3.2.0	2017-11-26 04:08:35 +08:00
Alex Lam S.L	c141ae6f8d	fix argument/atom collision by `properties` (#2514 ) fixes #2513	2017-11-25 22:52:46 +08:00
Alex Lam S.L	97c464dbf5	fix wording and formatting (#2512 )	2017-11-25 19:07:46 +08:00
Alex Lam S.L	3b28b915eb	extend escape analysis on constant expression properties (#2509 ) fixes #2508	2017-11-24 14:07:39 +08:00
Alex Lam S.L	eb001dc1d9	fix argument/atom collision by `collapse_vars` (#2507 ) fixes #2506	2017-11-24 07:26:22 +08:00
Alex Lam S.L	aa9bdf416e	make `AST_Lambda.contains_this()` less magical (#2505 )	2017-11-24 07:03:37 +08:00
Alex Lam S.L	8987780db6	eliminate invalid state caching in `collapse_vars` (#2502 ) fixes #2497	2017-11-24 04:12:37 +08:00
Alex Lam S.L	30cfea2e7a	fix `rename` (#2501 ) - suppress spurious `rename` from `commander` - handle `AST_SymbolCatch` correctly	2017-11-24 03:05:43 +08:00
Alex Lam S.L	f4e2fb9864	expand symbol space to improve compression (#2460 ) - give globally distinct names to distinct variables - improve ability to compress cross-scoped - introduce `options.rename` to `minify()` - default `true` if both `compress` & `mangle`	2017-11-19 19:29:51 +08:00
Alex Lam S.L	b80062c490	enable `hoist_props` by default (#2492 )	2017-11-19 14:56:23 +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
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	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	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