From b4ff6d0f2da3f094cf1bb4897a2dc67ad4f3efa5 Mon Sep 17 00:00:00 2001 From: "Alex Lam S.L" Date: Sat, 26 Sep 2020 08:31:33 +0100 Subject: fix corner cases in `functions` & `merge_vars` (#4156) fixes #4155 --- lib/compress.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/compress.js b/lib/compress.js index 3f7eee68..25a993f6 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -4449,7 +4449,9 @@ merge(Compressor.prototype, { segment.block = node; walk_body(node, tw); if (node.bcatch) { - references[node.bcatch.argname.definition().id] = false; + var def = node.bcatch.argname.definition(); + references[def.id] = false; + if (def = def.redefined()) references[def.id] = false; pop(); push(); walk_body(node.bcatch, tw); @@ -4843,8 +4845,10 @@ merge(Compressor.prototype, { && !compressor.option("ie8") && var_defs.length == 1 && sym.assignments == 0 - && def.value === def.name.fixed_value() && def.value instanceof AST_Function + && (sym.references.length ? all(sym.references, function(ref) { + return def.value === ref.fixed_value(); + }) : def.value === def.name.fixed_value()) && (!def.value.name || (old_def = def.value.name.definition()).assignments == 0 && (old_def.name == def.name.name || all(old_def.references, function(ref) { return ref.scope.find_variable(def.name) === def.name.definition(); -- cgit v1.2.3