eliminate noop calls more aggressively

This commit is contained in:
alexlamsl 2017-12-07 00:52:17 +08:00
parent b9f3ddfb30
commit 87cea676f2
2 changed files with 33 additions and 12 deletions

View File

@ -3444,11 +3444,11 @@ merge(Compressor.prototype, {
OPT(AST_Call, function(self, compressor){
var exp = self.expression;
var fn = exp;
if (compressor.option("reduce_vars") && fn instanceof AST_SymbolRef) {
fn = fn.fixed_value();
}
if (compressor.option("unused")
&& (fn instanceof AST_Function
|| compressor.option("reduce_vars")
&& fn instanceof AST_SymbolRef
&& (fn = fn.fixed_value()) instanceof AST_Function)
&& fn instanceof AST_Function
&& !fn.uses_arguments
&& !fn.uses_eval) {
var pos = 0, last = 0;
@ -3667,14 +3667,15 @@ merge(Compressor.prototype, {
return make_sequence(self, args).optimize(compressor);
}
}
if (exp instanceof AST_Function) {
if (fn instanceof AST_Function) {
if (compressor.option("inline")
&& !exp.name
&& !exp.uses_arguments
&& !exp.uses_eval
&& exp.body.length == 1
&& !exp.contains_this()
&& all(exp.argnames, function(arg) {
&& exp === fn
&& !fn.name
&& !fn.uses_arguments
&& !fn.uses_eval
&& fn.body.length == 1
&& !fn.contains_this()
&& all(fn.argnames, function(arg) {
return arg.__unused;
})
&& !self.has_pure_annotation(compressor)) {
@ -3692,7 +3693,7 @@ merge(Compressor.prototype, {
return make_sequence(self, args).optimize(compressor);
}
}
if (compressor.option("side_effects") && all(exp.body, is_empty)) {
if (compressor.option("side_effects") && all(fn.body, is_empty)) {
var args = self.args.concat(make_node(AST_Undefined, self));
return make_sequence(self, args).optimize(compressor);
}

View File

@ -652,3 +652,23 @@ issue_2531_3: {
}
expect_stdout: "Greeting: Hello"
}
empty_body: {
options = {
reduce_vars: true,
side_effects: true,
}
input: {
function f() {
function noop() {}
noop();
return noop;
}
}
expect: {
function f() {
function noop() {}
return noop;
}
}
}