collapse(statements, compressor);
}
} while (CHANGED && max_iter-- > 0);
+ return statements;
function find_loop_scope_try() {
var node = compressor.self(), level = 0;
if (node.single_use && parent instanceof AST_VarDef && parent.value === node) return node;
// Replace variable with assignment when found
var hit_rhs;
- if (can_replace
- && !(node instanceof AST_SymbolDeclaration)
+ if (!(node instanceof AST_SymbolDeclaration)
&& (scan_lhs && lhs.equivalent_to(node)
|| scan_rhs && (hit_rhs = scan_rhs(node, this)))) {
- if (stop_if_hit && (hit_rhs || !lhs_local || !replace_all)) {
+ if (!can_replace || stop_if_hit && (hit_rhs || !lhs_local || !replace_all)) {
if (!hit_rhs || !value_def) abort = true;
return node;
}
});
OPT(AST_Block, function(self, compressor) {
- tighten_body(self.body, compressor);
+ self.body = tighten_body(self.body, compressor);
return self;
});
OPT(AST_BlockStatement, function(self, compressor) {
- tighten_body(self.body, compressor);
+ self.body = tighten_body(self.body, compressor);
switch (self.body.length) {
case 1: return self.body[0];
case 0: return make_node(AST_EmptyStatement, self);
});
OPT(AST_Lambda, function(self, compressor) {
- tighten_body(self.body, compressor);
+ self.body = tighten_body(self.body, compressor);
if (compressor.option("side_effects")
&& self.body.length == 1
&& self.body[0] === compressor.has_directive("use strict")) {
});
OPT(AST_Try, function(self, compressor) {
- tighten_body(self.body, compressor);
+ self.body = tighten_body(self.body, compressor);
if (self.bcatch && self.bfinally && all(self.bfinally.body, is_empty)) self.bfinally = null;
if (compressor.option("dead_code") && all(self.body, is_empty)) {
var body = [];
}
expect_stdout: "function"
}
+
+issue_3698_1: {
+ options = {
+ collapse_vars: true,
+ }
+ input: {
+ var log = console.log;
+ var a, b = 0, c = 0;
+ (function() {
+ a = b;
+ })(b++, (b++, c++));
+ log(a, b, c);
+ }
+ expect: {
+ var log = console.log;
+ var a, b = 0, c = 0;
+ (function() {
+ a = b;
+ })(b++, (b++, c++));
+ log(a, b, c);
+ }
+ expect_stdout: "2 2 1"
+}
+
+issue_3698_2: {
+ options = {
+ collapse_vars: true,
+ reduce_vars: true,
+ }
+ input: {
+ var log = console.log;
+ var a, b = 0, c = 0, d = 1;
+ (function f() {
+ a = b;
+ d-- && f();
+ })(b++, (b++, c++));
+ log(a, b, c, d);
+ }
+ expect: {
+ var log = console.log;
+ var a, b = 0, c = 0, d = 1;
+ (function f() {
+ a = b;
+ d-- && f();
+ })(b++, (b++, c++));
+ log(a, b, c, d);
+ }
+ expect_stdout: "2 2 1 -1"
+}
+
+issue_3698_3: {
+ options = {
+ collapse_vars: true,
+ reduce_vars: true,
+ }
+ input: {
+ var a = 0, b = 0;
+ (function f(c) {
+ {
+ b++;
+ var bar_1 = (b = 1 + b, c = 0);
+ a-- && f();
+ }
+ })();
+ console.log(b);
+ }
+ expect: {
+ var a = 0, b = 0;
+ (function f(c) {
+ var bar_1 = (b = 1 + ++b, c = 0);
+ a-- && f();
+ })();
+ console.log(b);
+ }
+ expect_stdout: "2"
+}