From 51803cdcb2a7d4e396b46b38acc1cb70152a3ad8 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Tue, 22 Sep 2020 05:03:06 +0800 Subject: [PATCH] fix corner case in `merge_vars` fixes #4139 --- lib/compress.js | 10 ++++------ test/compress/merge_vars.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/lib/compress.js b/lib/compress.js index 82bbbf1b..30a82e35 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -4408,12 +4408,9 @@ merge(Compressor.prototype, { if (node instanceof AST_Scope) { push(); segment.block = node; - if (node instanceof AST_Lambda) { - if (node.name) { - if (node !== self) segment.loop = true; - references[node.name.definition().id] = false; - } - references[node.variables.get("arguments").id] = false; + if (node instanceof AST_Lambda && node.name) { + if (node !== self) segment.loop = true; + references[node.name.definition().id] = false; } descend(); pop(); @@ -4533,6 +4530,7 @@ merge(Compressor.prototype, { } function mark(sym, read, write) { + if (sym.name == "arguments") return; var def = sym.definition(); if (def.id in references) { var refs = references[def.id]; diff --git a/test/compress/merge_vars.js b/test/compress/merge_vars.js index b5b71019..559832c2 100644 --- a/test/compress/merge_vars.js +++ b/test/compress/merge_vars.js @@ -2738,3 +2738,31 @@ issue_4135: { } expect_stdout: "1 -1 undefined" } + +issue_4139: { + options = { + merge_vars: true, + toplevel: true, + } + input: { + try { + console.log; + } catch (e) { + var a, arguments = 0; + } finally { + a = typeof arguments; + console.log(a); + } + } + expect: { + try { + console.log; + } catch (e) { + var a, arguments = 0; + } finally { + a = typeof arguments; + console.log(a); + } + } + expect_stdout: "object" +} -- 2.34.1