From d11c82f8ca554a3e7c7203b100e4b5cf2898ddd9 Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Wed, 8 Dec 2021 21:14:57 +0000
Subject: [PATCH] minor clean-up (#5209)

---
 lib/compress.js         |  6 +-----
 test/compress/arrows.js | 22 ++++++++++++++++++++++
 test/compress/awaits.js | 27 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/lib/compress.js b/lib/compress.js
index 5bb9bcb0..3a58f355 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -12390,9 +12390,7 @@ Compressor.prototype.compress = function(node) {
         }
     });
 
-    AST_Arrow.DEFMETHOD("contains_super", return_false);
-    AST_AsyncArrow.DEFMETHOD("contains_super", return_false);
-    AST_Lambda.DEFMETHOD("contains_super", function() {
+    AST_LambdaExpression.DEFMETHOD("contains_super", function() {
         var result;
         var self = this;
         self.walk(new TreeWalker(function(node) {
@@ -12402,8 +12400,6 @@ Compressor.prototype.compress = function(node) {
         }));
         return result;
     });
-    AST_LambdaDefinition.DEFMETHOD("contains_super", return_false);
-    AST_Scope.DEFMETHOD("contains_super", return_false);
 
     AST_Arrow.DEFMETHOD("contains_this", return_false);
     AST_AsyncArrow.DEFMETHOD("contains_this", return_false);
diff --git a/test/compress/arrows.js b/test/compress/arrows.js
index 5cbf56bc..54886d58 100644
--- a/test/compress/arrows.js
+++ b/test/compress/arrows.js
@@ -363,6 +363,28 @@ negate: {
 }
 
 inline_this: {
+    options = {
+        inline: true,
+    }
+    input: {
+        var p = "PASS";
+        console.log({
+            p: "FAIL",
+            q: (() => this.p)(),
+        }.q);
+    }
+    expect: {
+        var p = "PASS";
+        console.log({
+            p: "FAIL",
+            q: this.p,
+        }.q);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+dont_inline_this: {
     options = {
         inline: true,
     }
diff --git a/test/compress/awaits.js b/test/compress/awaits.js
index 7d79fe15..34479d48 100644
--- a/test/compress/awaits.js
+++ b/test/compress/awaits.js
@@ -340,6 +340,33 @@ inline_await_3_trim: {
     node_version: ">=8"
 }
 
+inline_await_this: {
+    options = {
+        awaits: true,
+        inline: true,
+    }
+    input: {
+        var p = "FAIL";
+        ({
+            p: "PASS",
+            async f() {
+                return await (async () => this.p)();
+            },
+        }).f().then(console.log);
+    }
+    expect: {
+        var p = "FAIL";
+        ({
+            p: "PASS",
+            async f() {
+                return await this.p;
+            },
+        }).f().then(console.log);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=8"
+}
+
 await_unary: {
     options = {
         awaits: true,