From 2db8ffe56a1dbc72eda5c4e50e9cf5d4a7c7c7f4 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Sun, 6 Oct 2019 00:05:21 +0800 Subject: [PATCH] fix variable scope determination fixes #3444 --- lib/compress.js | 12 +++++++++--- test/compress/functions.js | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/lib/compress.js b/lib/compress.js index 09d416cff8..8eab20b46b 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -3399,16 +3399,22 @@ merge(Compressor.prototype, { def(AST_Lambda, function(scope) { var self = this; var result = true; - self.walk(new TreeWalker(function(node) { + var inner_scopes = []; + self.walk(new TreeWalker(function(node, descend) { if (!result) return true; + if (node instanceof AST_Scope && node !== self) { + inner_scopes.push(node); + descend(); + inner_scopes.pop(); + return true; + } if (node instanceof AST_SymbolRef) { if (self.inlined) { result = false; return true; } var def = node.definition(); - if (member(def, self.enclosed) - && !self.variables.has(def.name)) { + if (!self.variables.has(def.name) && !member(def.scope, inner_scopes)) { if (scope) { var scope_def = scope.find_variable(node); if (def.undeclared ? !scope_def : scope_def === def) { diff --git a/test/compress/functions.js b/test/compress/functions.js index 82295383ed..40a38c0269 100644 --- a/test/compress/functions.js +++ b/test/compress/functions.js @@ -3148,3 +3148,30 @@ issue_3402: { "function", ] } + +issue_3444: { + options = { + inline: true, + reduce_vars: true, + unused: true, + } + input: { + (function(h) { + return f; + function f() { + g(); + } + function g() { + h("PASS"); + } + })(console.log)(); + } + expect: { + (function(h) { + return function() { + void h("PASS"); + }; + })(console.log)(); + } + expect_stdout: "PASS" +}