enhance collapse_vars (#4864)
This commit is contained in:
@@ -1856,6 +1856,7 @@ merge(Compressor.prototype, {
|
||||
case 0:
|
||||
hit = true;
|
||||
if (assign_used) return node;
|
||||
if (node !== candidate) return node;
|
||||
if (node instanceof AST_VarDef) return node;
|
||||
def.replaced++;
|
||||
var parent = multi_replacer.parent();
|
||||
@@ -1957,7 +1958,9 @@ merge(Compressor.prototype, {
|
||||
for (var i = stat_index; !abort && i < statements.length; i++) {
|
||||
if (!statements[i].transform(multi_replacer)) statements.splice(i--, 1);
|
||||
}
|
||||
if (candidate instanceof AST_VarDef) {
|
||||
if (candidate !== hit_stack[hit_stack.length - 1]) {
|
||||
replaced = false;
|
||||
} else if (candidate instanceof AST_VarDef) {
|
||||
replaced = !compressor.exposed(def) && def.references.length == def.replaced;
|
||||
}
|
||||
value_def.single_use = false;
|
||||
@@ -2546,15 +2549,23 @@ merge(Compressor.prototype, {
|
||||
}
|
||||
}
|
||||
|
||||
function mangleable_var(value) {
|
||||
function mangleable_var(rhs) {
|
||||
if (force_single) {
|
||||
force_single = false;
|
||||
return;
|
||||
}
|
||||
var value = rhs instanceof AST_Assign && rhs.operator == "=" ? rhs.left : rhs;
|
||||
if (!(value instanceof AST_SymbolRef)) return;
|
||||
var def = value.definition();
|
||||
if (def.undeclared) return;
|
||||
if (is_arguments(def)) return;
|
||||
if (value !== rhs) {
|
||||
if (value.is_immutable()) return;
|
||||
var referenced = def.references.length - def.replaced;
|
||||
if (referenced < 2) return;
|
||||
candidate = candidate.clone();
|
||||
candidate[candidate instanceof AST_Assign ? "right" : "value"] = value;
|
||||
}
|
||||
return value_def = def;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user