From 74801de315df085b0657660dcb9615cca67743e1 Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Fri, 1 May 2020 02:06:40 +0100
Subject: [PATCH] fix corner cases in `inline` (#3834)

fixes #3833
fixes #3835
---
 lib/compress.js            |  7 ++++++
 test/compress/functions.js | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/lib/compress.js b/lib/compress.js
index 15db2332..79f52783 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3991,10 +3991,17 @@ merge(Compressor.prototype, {
                 if (!call || call.TYPE != "Call") break;
                 var fn = call.expression;
                 if (fn instanceof AST_SymbolRef) {
+                    if (self.name && self.name.definition() === fn.definition()) break;
                     fn = fn.fixed_value();
                 }
                 if (!(fn instanceof AST_Lambda)) break;
                 if (fn.uses_arguments) break;
+                if (fn === call.expression) {
+                    if (fn.parent_scope !== self) break;
+                    if (!all(fn.enclosed, function(def) {
+                        return def.scope !== self;
+                    })) break;
+                }
                 if (fn.contains_this()) break;
                 var j = fn.argnames.length;
                 if (j > 0 && compressor.option("inline") < 2) break;
diff --git a/test/compress/functions.js b/test/compress/functions.js
index 262bb6ac..f5ad08b4 100644
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -4590,3 +4590,50 @@ substitude_use_strict: {
         "PASS",
     ]
 }
+
+issue_3833: {
+    options = {
+        inline: true,
+        keep_fargs: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f(a) {
+            return function() {
+                while (a);
+                console.log("PASS");
+            }();
+        }
+        f();
+    }
+    expect: {
+        (function() {
+            while (a);
+            console.log("PASS");
+        })();
+        var a;
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3835: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+    }
+    input: {
+        (function f() {
+            return function() {
+                return f();
+            }();
+        })();
+    }
+    expect: {
+        (function f() {
+            return f();
+        })();
+    }
+    expect_stdout: true
+}
-- 
2.34.1