From 8fa470c17c56d62f971fa71fb1cb99e961b64d8e Mon Sep 17 00:00:00 2001 From: "Alex Lam S.L" Date: Sun, 20 Sep 2020 16:54:14 +0100 Subject: [PATCH] fix corner case in `merge_vars` (#4136) fixes #4135 --- lib/compress.js | 7 +++++-- test/compress/merge_vars.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/lib/compress.js b/lib/compress.js index 2df76f5f..82bbbf1b 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -4485,9 +4485,12 @@ merge(Compressor.prototype, { var head = first.pop(); var def = head.definition; if (!(def.id in prev)) continue; - var head_refs = references[def.id]; - if (!head_refs) continue; + if (!references[def.id]) continue; + var head_refs = { + start: references[def.id].start, + }; while (def.id in merged) def = merged[def.id]; + head_refs.end = references[def.id].end; var skipped = []; do { var tail = last.pop(); diff --git a/test/compress/merge_vars.js b/test/compress/merge_vars.js index d48b1178..b5b71019 100644 --- a/test/compress/merge_vars.js +++ b/test/compress/merge_vars.js @@ -2701,3 +2701,40 @@ issue_4130: { "1", ] } + +issue_4135: { + options = { + evaluate: true, + inline: true, + merge_vars: true, + reduce_vars: true, + side_effects: true, + toplevel: true, + unused: true, + } + input: { + var a = 0, b = 0; + --b; + a++; + if (!a) + var c = function() { + var d = 0; + function f() { + d && d.p; + } + f(); + this; + }(a++); + console.log(a, b, c); + } + expect: { + var a = 0; + 0; + a++; + if (!a) + c = (a++, c = 0, void (c && c.p)); + var c; + console.log(a, -1, c); + } + expect_stdout: "1 -1 undefined" +} -- 2.34.1