From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Sat, 5 Oct 2019 21:13:44 +0000 (+0800)
Subject: fix variable scope determination (#3449)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=a31c477feaf75a1590a4e89e39f1b0b0e7f33882;p=UglifyJS.git

fix variable scope determination (#3449)

fixes #3444
---

diff --git a/lib/compress.js b/lib/compress.js
index 09d416cf..8eab20b4 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 82295383..40a38c02 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"
+}