From 7e465d4a01f2cbcae24e1c60ee96969c14130287 Mon Sep 17 00:00:00 2001 From: "Alex Lam S.L" Date: Thu, 9 Mar 2017 05:22:27 +0800 Subject: [PATCH] scan RHS of dropped assignments (#1581) - similar case as #1578 but against #1450 instead - fix `this` binding in #1450 as well closes #1580 --- lib/compress.js | 18 ++++++++---------- test/compress/drop-unused.js | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/lib/compress.js b/lib/compress.js index 302f8f56..f6b76ec2 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -1901,17 +1901,15 @@ merge(Compressor.prototype, { } return node; } - if (drop_vars && assign_as_unused) { - var n = node; - while (n instanceof AST_Assign - && n.operator == "=" - && n.left instanceof AST_SymbolRef) { - var def = n.left.definition(); - if (def.id in in_use_ids - || self.variables.get(def.name) !== def) break; - n = n.right; + if (drop_vars && assign_as_unused + && node instanceof AST_Assign + && node.operator == "=" + && node.left instanceof AST_SymbolRef) { + var def = node.left.definition(); + if (!(def.id in in_use_ids) + && self.variables.get(def.name) === def) { + return maintain_this_binding(tt.parent(), node, node.right.transform(tt)); } - if (n !== node) return n; } if (node instanceof AST_For) { descend(node, this); diff --git a/test/compress/drop-unused.js b/test/compress/drop-unused.js index 9c960561..728557a6 100644 --- a/test/compress/drop-unused.js +++ b/test/compress/drop-unused.js @@ -725,3 +725,39 @@ vardef_value: { } } } + +assign_binding: { + options = { + cascade: true, + side_effects: true, + unused: true, + } + input: { + function f() { + var a; + a = f.g, a(); + } + } + expect: { + function f() { + (0, f.g)(); + } + } +} + +assign_chain: { + options = { + unused: true, + } + input: { + function f() { + var a, b; + x = a = y = b = 42; + } + } + expect: { + function f() { + x = y = 42; + } + } +} -- 2.34.1