From ea359a1d817218c6c80966eaa9bbde36df1d9373 Mon Sep 17 00:00:00 2001
From: Caio Lima <ticaiolima@gmail.com>
Date: Wed, 10 Jul 2019 17:58:19 -0300
Subject: [PATCH] Added tests to cover access of private members on inner
 regular functions and arrow functions. (#2228)

---
 ...-field-access-on-inner-arrow-function.case | 38 ++++++++++++++++
 ...rivate-field-access-on-inner-function.case | 39 +++++++++++++++++
 ...getter-access-on-inner-arrow-function.case | 38 ++++++++++++++++
 ...ivate-getter-access-on-inner-function.case | 39 +++++++++++++++++
 ...method-access-on-inner-arrow-function.case | 38 ++++++++++++++++
 ...ivate-method-access-on-inner-function.case | 39 +++++++++++++++++
 ...setter-access-on-inner-arrow-function.case | 39 +++++++++++++++++
 ...ivate-setter-access-on-inner-function.case | 40 +++++++++++++++++
 ...te-field-access-on-inner-arrow-function.js | 41 ++++++++++++++++++
 .../private-field-access-on-inner-function.js | 42 ++++++++++++++++++
 ...e-getter-access-on-inner-arrow-function.js | 41 ++++++++++++++++++
 ...private-getter-access-on-inner-function.js | 42 ++++++++++++++++++
 ...e-method-access-on-inner-arrow-function.js | 41 ++++++++++++++++++
 ...private-method-access-on-inner-function.js | 42 ++++++++++++++++++
 ...e-setter-access-on-inner-arrow-function.js | 42 ++++++++++++++++++
 ...private-setter-access-on-inner-function.js | 43 +++++++++++++++++++
 ...te-field-access-on-inner-arrow-function.js | 41 ++++++++++++++++++
 .../private-field-access-on-inner-function.js | 42 ++++++++++++++++++
 ...e-getter-access-on-inner-arrow-function.js | 41 ++++++++++++++++++
 ...private-getter-access-on-inner-function.js | 42 ++++++++++++++++++
 ...e-method-access-on-inner-arrow-function.js | 41 ++++++++++++++++++
 ...private-method-access-on-inner-function.js | 42 ++++++++++++++++++
 ...e-setter-access-on-inner-arrow-function.js | 42 ++++++++++++++++++
 ...private-setter-access-on-inner-function.js | 43 +++++++++++++++++++
 24 files changed, 978 insertions(+)
 create mode 100644 src/class-elements/private-field-access-on-inner-arrow-function.case
 create mode 100644 src/class-elements/private-field-access-on-inner-function.case
 create mode 100644 src/class-elements/private-getter-access-on-inner-arrow-function.case
 create mode 100644 src/class-elements/private-getter-access-on-inner-function.case
 create mode 100644 src/class-elements/private-method-access-on-inner-arrow-function.case
 create mode 100644 src/class-elements/private-method-access-on-inner-function.case
 create mode 100644 src/class-elements/private-setter-access-on-inner-arrow-function.case
 create mode 100644 src/class-elements/private-setter-access-on-inner-function.case
 create mode 100644 test/language/expressions/class/elements/private-field-access-on-inner-arrow-function.js
 create mode 100644 test/language/expressions/class/elements/private-field-access-on-inner-function.js
 create mode 100644 test/language/expressions/class/elements/private-getter-access-on-inner-arrow-function.js
 create mode 100644 test/language/expressions/class/elements/private-getter-access-on-inner-function.js
 create mode 100644 test/language/expressions/class/elements/private-method-access-on-inner-arrow-function.js
 create mode 100644 test/language/expressions/class/elements/private-method-access-on-inner-function.js
 create mode 100644 test/language/expressions/class/elements/private-setter-access-on-inner-arrow-function.js
 create mode 100644 test/language/expressions/class/elements/private-setter-access-on-inner-function.js
 create mode 100644 test/language/statements/class/elements/private-field-access-on-inner-arrow-function.js
 create mode 100644 test/language/statements/class/elements/private-field-access-on-inner-function.js
 create mode 100644 test/language/statements/class/elements/private-getter-access-on-inner-arrow-function.js
 create mode 100644 test/language/statements/class/elements/private-getter-access-on-inner-function.js
 create mode 100644 test/language/statements/class/elements/private-method-access-on-inner-arrow-function.js
 create mode 100644 test/language/statements/class/elements/private-method-access-on-inner-function.js
 create mode 100644 test/language/statements/class/elements/private-setter-access-on-inner-arrow-function.js
 create mode 100644 test/language/statements/class/elements/private-setter-access-on-inner-function.js

diff --git a/src/class-elements/private-field-access-on-inner-arrow-function.case b/src/class-elements/private-field-access-on-inner-arrow-function.case
new file mode 100644
index 0000000000..34bc8e00d8
--- /dev/null
+++ b/src/class-elements/private-field-access-on-inner-arrow-function.case
@@ -0,0 +1,38 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private field is visible on inner arrow function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-fields-private]
+---*/
+
+//- elements
+#f = 'Test262';
+
+method() {
+  let arrowFunction = () => {
+    return this.#f;
+  }
+
+  return arrowFunction();
+}
+//- assertions
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private field from an ordinary object');
diff --git a/src/class-elements/private-field-access-on-inner-function.case b/src/class-elements/private-field-access-on-inner-function.case
new file mode 100644
index 0000000000..7a513f707e
--- /dev/null
+++ b/src/class-elements/private-field-access-on-inner-function.case
@@ -0,0 +1,39 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private field is visible on inner function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-fields-private]
+---*/
+
+//- elements
+#f = 'Test262';
+
+method() {
+  let self = this;
+  function innerFunction() {
+    return self.#f;
+  }
+
+  return innerFunction();
+}
+//- assertions
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private field from an ordinary object');
diff --git a/src/class-elements/private-getter-access-on-inner-arrow-function.case b/src/class-elements/private-getter-access-on-inner-arrow-function.case
new file mode 100644
index 0000000000..722537e9b3
--- /dev/null
+++ b/src/class-elements/private-getter-access-on-inner-arrow-function.case
@@ -0,0 +1,38 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private getter is visible on inner arrow function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-methods-private]
+---*/
+
+//- elements
+get #m() { return 'Test262'; }
+
+method() {
+  let arrowFunction = () => {
+    return this.#m;
+  }
+
+  return arrowFunction();
+}
+//- assertions
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private accessor from an ordinary object');
diff --git a/src/class-elements/private-getter-access-on-inner-function.case b/src/class-elements/private-getter-access-on-inner-function.case
new file mode 100644
index 0000000000..b53a6756de
--- /dev/null
+++ b/src/class-elements/private-getter-access-on-inner-function.case
@@ -0,0 +1,39 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private getter is visible on inner function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-methods-private]
+---*/
+
+//- elements
+get #m() { return 'Test262'; }
+
+method() {
+  let self = this;
+  function innerFunction() {
+    return self.#m;
+  }
+
+  return innerFunction();
+}
+//- assertions
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private accessor from an ordinary object');
diff --git a/src/class-elements/private-method-access-on-inner-arrow-function.case b/src/class-elements/private-method-access-on-inner-arrow-function.case
new file mode 100644
index 0000000000..b6d42862e2
--- /dev/null
+++ b/src/class-elements/private-method-access-on-inner-arrow-function.case
@@ -0,0 +1,38 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private method is visible on inner arrow function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-methods-private]
+---*/
+
+//- elements
+#m() { return 'Test262'; }
+
+method() {
+  let arrowFunction = () => {
+    return this.#m();
+  }
+
+  return arrowFunction();
+}
+//- assertions
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private method from an ordinary object');
diff --git a/src/class-elements/private-method-access-on-inner-function.case b/src/class-elements/private-method-access-on-inner-function.case
new file mode 100644
index 0000000000..d639cb516e
--- /dev/null
+++ b/src/class-elements/private-method-access-on-inner-function.case
@@ -0,0 +1,39 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private method is visible on inner function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-methods-private]
+---*/
+
+//- elements
+#m() { return 'Test262'; }
+
+method() {
+  let self = this;
+  function innerFunction() {
+    return self.#m();
+  }
+
+  return innerFunction();
+}
+//- assertions
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private method from an ordinary object');
diff --git a/src/class-elements/private-setter-access-on-inner-arrow-function.case b/src/class-elements/private-setter-access-on-inner-arrow-function.case
new file mode 100644
index 0000000000..fc32cb15c0
--- /dev/null
+++ b/src/class-elements/private-setter-access-on-inner-arrow-function.case
@@ -0,0 +1,39 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private setter is visible on inner arrow function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-methods-private]
+---*/
+
+//- elements
+set #m(v) { this._v = v; }
+
+method() {
+  let arrowFunction = () => {
+    this.#m = 'Test262';
+  }
+
+  arrowFunction();
+}
+//- assertions
+let c = new C();
+c.method();
+assert.sameValue(c._v, 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private setter from an ordinary object');
diff --git a/src/class-elements/private-setter-access-on-inner-function.case b/src/class-elements/private-setter-access-on-inner-function.case
new file mode 100644
index 0000000000..31a4b01b95
--- /dev/null
+++ b/src/class-elements/private-setter-access-on-inner-function.case
@@ -0,0 +1,40 @@
+// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: PrivateName of private setter is visible on inner function of class scope
+info: |
+  Updated Productions
+
+  CallExpression[Yield, Await]:
+    CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+    SuperCall[?Yield, ?Await]
+    CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+    CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+    CallExpression[?Yield, ?Await].IdentifierName
+    CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+    CallExpression[?Yield, ?Await].PrivateName
+
+template: default
+features: [class-methods-private]
+---*/
+
+//- elements
+set #m(v) { this._v = v; }
+
+method() {
+  let self = this;
+  function innerFunction() {
+    self.#m = 'Test262';
+  }
+
+  innerFunction();
+}
+//- assertions
+let c = new C();
+c.method();
+assert.sameValue(c._v, 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private setter from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-field-access-on-inner-arrow-function.js b/test/language/expressions/class/elements/private-field-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..bd51492dba
--- /dev/null
+++ b/test/language/expressions/class/elements/private-field-access-on-inner-arrow-function.js
@@ -0,0 +1,41 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-field-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private field is visible on inner arrow function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-fields-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  #f = 'Test262';
+
+  method() {
+    let arrowFunction = () => {
+      return this.#f;
+    }
+
+    return arrowFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private field from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-field-access-on-inner-function.js b/test/language/expressions/class/elements/private-field-access-on-inner-function.js
new file mode 100644
index 0000000000..18209f3e26
--- /dev/null
+++ b/test/language/expressions/class/elements/private-field-access-on-inner-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-field-access-on-inner-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private field is visible on inner function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-fields-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  #f = 'Test262';
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      return self.#f;
+    }
+
+    return innerFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private field from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-getter-access-on-inner-arrow-function.js b/test/language/expressions/class/elements/private-getter-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..3c1f0eb71b
--- /dev/null
+++ b/test/language/expressions/class/elements/private-getter-access-on-inner-arrow-function.js
@@ -0,0 +1,41 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-getter-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private getter is visible on inner arrow function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  get #m() { return 'Test262'; }
+
+  method() {
+    let arrowFunction = () => {
+      return this.#m;
+    }
+
+    return arrowFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private accessor from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-getter-access-on-inner-function.js b/test/language/expressions/class/elements/private-getter-access-on-inner-function.js
new file mode 100644
index 0000000000..89e2665be3
--- /dev/null
+++ b/test/language/expressions/class/elements/private-getter-access-on-inner-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-getter-access-on-inner-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private getter is visible on inner function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  get #m() { return 'Test262'; }
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      return self.#m;
+    }
+
+    return innerFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private accessor from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-method-access-on-inner-arrow-function.js b/test/language/expressions/class/elements/private-method-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..a122d5546f
--- /dev/null
+++ b/test/language/expressions/class/elements/private-method-access-on-inner-arrow-function.js
@@ -0,0 +1,41 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-method-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private method is visible on inner arrow function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  #m() { return 'Test262'; }
+
+  method() {
+    let arrowFunction = () => {
+      return this.#m();
+    }
+
+    return arrowFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private method from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-method-access-on-inner-function.js b/test/language/expressions/class/elements/private-method-access-on-inner-function.js
new file mode 100644
index 0000000000..a6566c9344
--- /dev/null
+++ b/test/language/expressions/class/elements/private-method-access-on-inner-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-method-access-on-inner-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private method is visible on inner function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  #m() { return 'Test262'; }
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      return self.#m();
+    }
+
+    return innerFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private method from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-setter-access-on-inner-arrow-function.js b/test/language/expressions/class/elements/private-setter-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..6a517730a3
--- /dev/null
+++ b/test/language/expressions/class/elements/private-setter-access-on-inner-arrow-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-setter-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private setter is visible on inner arrow function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  set #m(v) { this._v = v; }
+
+  method() {
+    let arrowFunction = () => {
+      this.#m = 'Test262';
+    }
+
+    arrowFunction();
+  }
+}
+
+let c = new C();
+c.method();
+assert.sameValue(c._v, 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private setter from an ordinary object');
diff --git a/test/language/expressions/class/elements/private-setter-access-on-inner-function.js b/test/language/expressions/class/elements/private-setter-access-on-inner-function.js
new file mode 100644
index 0000000000..0d8bfd4e63
--- /dev/null
+++ b/test/language/expressions/class/elements/private-setter-access-on-inner-function.js
@@ -0,0 +1,43 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-setter-access-on-inner-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: PrivateName of private setter is visible on inner function of class scope (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+var C = class {
+  set #m(v) { this._v = v; }
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      self.#m = 'Test262';
+    }
+
+    innerFunction();
+  }
+}
+
+let c = new C();
+c.method();
+assert.sameValue(c._v, 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private setter from an ordinary object');
diff --git a/test/language/statements/class/elements/private-field-access-on-inner-arrow-function.js b/test/language/statements/class/elements/private-field-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..3c626db89e
--- /dev/null
+++ b/test/language/statements/class/elements/private-field-access-on-inner-arrow-function.js
@@ -0,0 +1,41 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-field-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private field is visible on inner arrow function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-fields-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  #f = 'Test262';
+
+  method() {
+    let arrowFunction = () => {
+      return this.#f;
+    }
+
+    return arrowFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private field from an ordinary object');
diff --git a/test/language/statements/class/elements/private-field-access-on-inner-function.js b/test/language/statements/class/elements/private-field-access-on-inner-function.js
new file mode 100644
index 0000000000..0e5e308525
--- /dev/null
+++ b/test/language/statements/class/elements/private-field-access-on-inner-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-field-access-on-inner-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private field is visible on inner function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-fields-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  #f = 'Test262';
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      return self.#f;
+    }
+
+    return innerFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private field from an ordinary object');
diff --git a/test/language/statements/class/elements/private-getter-access-on-inner-arrow-function.js b/test/language/statements/class/elements/private-getter-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..087142eb93
--- /dev/null
+++ b/test/language/statements/class/elements/private-getter-access-on-inner-arrow-function.js
@@ -0,0 +1,41 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-getter-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private getter is visible on inner arrow function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  get #m() { return 'Test262'; }
+
+  method() {
+    let arrowFunction = () => {
+      return this.#m;
+    }
+
+    return arrowFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private accessor from an ordinary object');
diff --git a/test/language/statements/class/elements/private-getter-access-on-inner-function.js b/test/language/statements/class/elements/private-getter-access-on-inner-function.js
new file mode 100644
index 0000000000..2e7fafb20a
--- /dev/null
+++ b/test/language/statements/class/elements/private-getter-access-on-inner-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-getter-access-on-inner-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private getter is visible on inner function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  get #m() { return 'Test262'; }
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      return self.#m;
+    }
+
+    return innerFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private accessor from an ordinary object');
diff --git a/test/language/statements/class/elements/private-method-access-on-inner-arrow-function.js b/test/language/statements/class/elements/private-method-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..488df0afcb
--- /dev/null
+++ b/test/language/statements/class/elements/private-method-access-on-inner-arrow-function.js
@@ -0,0 +1,41 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-method-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private method is visible on inner arrow function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  #m() { return 'Test262'; }
+
+  method() {
+    let arrowFunction = () => {
+      return this.#m();
+    }
+
+    return arrowFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private method from an ordinary object');
diff --git a/test/language/statements/class/elements/private-method-access-on-inner-function.js b/test/language/statements/class/elements/private-method-access-on-inner-function.js
new file mode 100644
index 0000000000..b672931c77
--- /dev/null
+++ b/test/language/statements/class/elements/private-method-access-on-inner-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-method-access-on-inner-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private method is visible on inner function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  #m() { return 'Test262'; }
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      return self.#m();
+    }
+
+    return innerFunction();
+  }
+}
+
+let c = new C();
+assert.sameValue(c.method(), 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private method from an ordinary object');
diff --git a/test/language/statements/class/elements/private-setter-access-on-inner-arrow-function.js b/test/language/statements/class/elements/private-setter-access-on-inner-arrow-function.js
new file mode 100644
index 0000000000..640996d1e2
--- /dev/null
+++ b/test/language/statements/class/elements/private-setter-access-on-inner-arrow-function.js
@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-setter-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private setter is visible on inner arrow function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  set #m(v) { this._v = v; }
+
+  method() {
+    let arrowFunction = () => {
+      this.#m = 'Test262';
+    }
+
+    arrowFunction();
+  }
+}
+
+let c = new C();
+c.method();
+assert.sameValue(c._v, 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private setter from an ordinary object');
diff --git a/test/language/statements/class/elements/private-setter-access-on-inner-function.js b/test/language/statements/class/elements/private-setter-access-on-inner-function.js
new file mode 100644
index 0000000000..3ea9a612ad
--- /dev/null
+++ b/test/language/statements/class/elements/private-setter-access-on-inner-function.js
@@ -0,0 +1,43 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/private-setter-access-on-inner-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: PrivateName of private setter is visible on inner function of class scope (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-methods-private, class]
+flags: [generated]
+info: |
+    Updated Productions
+
+    CallExpression[Yield, Await]:
+      CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await]
+      SuperCall[?Yield, ?Await]
+      CallExpression[?Yield, ?Await]Arguments[?Yield, ?Await]
+      CallExpression[?Yield, ?Await][Expression[+In, ?Yield, ?Await]]
+      CallExpression[?Yield, ?Await].IdentifierName
+      CallExpression[?Yield, ?Await]TemplateLiteral[?Yield, ?Await]
+      CallExpression[?Yield, ?Await].PrivateName
+
+---*/
+
+
+class C {
+  set #m(v) { this._v = v; }
+
+  method() {
+    let self = this;
+    function innerFunction() {
+      self.#m = 'Test262';
+    }
+
+    innerFunction();
+  }
+}
+
+let c = new C();
+c.method();
+assert.sameValue(c._v, 'Test262');
+let o = {};
+assert.throws(TypeError, function() {
+  c.method.call(o);
+}, 'accessed private setter from an ordinary object');