fix corner cases in inline (#3773)

fixes #3770
fixes #3771
fixes #3772
This commit is contained in:
Alex Lam S.L
2020-04-10 17:34:45 +01:00
committed by GitHub
parent b35f4c5a83
commit a2b16e89a4
2 changed files with 96 additions and 3 deletions

View File

@@ -5828,14 +5828,17 @@ merge(Compressor.prototype, {
&& !(fn.name && fn instanceof AST_Function)
&& (value = can_flatten_body(stat))
&& (exp === fn
|| !recursive_ref(compressor, def = exp.definition) && fn.is_constant_expression(exp.scope))
|| !recursive_ref(compressor, def = exp.definition()) && fn.is_constant_expression(exp.scope))
&& !fn.contains_this()) {
if (can_substitute_directly()) {
var args = self.args.slice();
args.push(value.clone(true).transform(new TreeTransformer(function(node) {
if (node instanceof AST_SymbolRef) {
var def = node.definition();
if (fn.variables.get(node.name) !== def) return node;
if (fn.variables.get(node.name) !== def) {
if (exp !== fn) def.references.push(node);
return node;
}
var index = resolve_index(def);
var arg = args[index];
if (!arg) return make_node(AST_Undefined, self);
@@ -5931,10 +5934,14 @@ merge(Compressor.prototype, {
function can_substitute_directly() {
if (compressor.option("inline") <= 1 && fn.argnames.length) return;
if (fn.variables.size() > fn.argnames.length + 1) return;
var var_count = fn.variables.size() - 1;
if (var_count > fn.argnames.length) return;
var var_names = [];
if (!all(fn.argnames, function(argname) {
push_uniq(var_names, argname.name);
return argname.definition().references.length < 2;
})) return;
if (var_count > var_names.length) return;
var abort = false;
var begin;
var in_order = [];