From 4114b3749ffdeb34ff10a43c2e1411724415482f Mon Sep 17 00:00:00 2001 From: Caio Lima Date: Wed, 8 May 2019 18:01:30 -0300 Subject: [PATCH 1/3] Adding tests to cover private methods comparison --- .../private-method-comparison.case | 43 +++++++++++++++++ .../elements/private-method-comparison.js | 45 ++++++++++++++++++ ...omparison-multiple-evaluations-of-class.js | 46 +++++++++++++++++++ .../elements/private-method-comparison.js | 45 ++++++++++++++++++ 4 files changed, 179 insertions(+) create mode 100644 src/class-elements/private-method-comparison.case create mode 100644 test/language/expressions/class/elements/private-method-comparison.js create mode 100644 test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js create mode 100644 test/language/statements/class/elements/private-method-comparison.js diff --git a/src/class-elements/private-method-comparison.case b/src/class-elements/private-method-comparison.case new file mode 100644 index 0000000000..81ff182936 --- /dev/null +++ b/src/class-elements/private-method-comparison.case @@ -0,0 +1,43 @@ +// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +desc: PrivateFieldGet of a private method returns the same function object to every instance of the same class +esid: sec-privatefieldget +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +template: default +features: [class, class-methods-private] +---*/ + +//- elements +#m() { return 'test262'; } + +getPrivateMethod() { + return this.#m; +} + +//- assertions +let c1 = new C(); +let c2 = new C(); + +assert.sameValue(c1.getPrivateMethod(), c2.getPrivateMethod()); diff --git a/test/language/expressions/class/elements/private-method-comparison.js b/test/language/expressions/class/elements/private-method-comparison.js new file mode 100644 index 0000000000..f8d56ac2ac --- /dev/null +++ b/test/language/expressions/class/elements/private-method-comparison.js @@ -0,0 +1,45 @@ +// This file was procedurally generated from the following sources: +// - src/class-elements/private-method-comparison.case +// - src/class-elements/default/cls-expr.template +/*--- +description: PrivateFieldGet of a private method returns the same function object to every instance of a class (field definitions in a class expression) +esid: prod-FieldDefinition +features: [class, class-methods-private] +flags: [generated] +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +---*/ + + +var C = class { + #m() { return 'test262'; } + + getPrivateMethod() { + return this.#m; + } + +} + +let c1 = new C(); +let c2 = new C(); + +assert.sameValue(c1.getPrivateMethod(), c2.getPrivateMethod()); diff --git a/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js b/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js new file mode 100644 index 0000000000..fddc649805 --- /dev/null +++ b/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js @@ -0,0 +1,46 @@ +// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +description: Every new evaluation of a class creates a different brand (private getter) +esid: sec-privatefieldget +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +features: [class, class-methods-private] +---*/ + +let createAndInstantiateClass = function () { + class C { + #m() { return 'test262'; } + + getPrivateMethod() { + return this.#m; + } + } + + return new C(); +}; + +let c1 = createAndInstantiateClass(); +let c2 = createAndInstantiateClass(); + +assert.notSameValue(c1.getPrivateMethod(), c2.getPrivateMethod()); diff --git a/test/language/statements/class/elements/private-method-comparison.js b/test/language/statements/class/elements/private-method-comparison.js new file mode 100644 index 0000000000..ca368bb5e5 --- /dev/null +++ b/test/language/statements/class/elements/private-method-comparison.js @@ -0,0 +1,45 @@ +// This file was procedurally generated from the following sources: +// - src/class-elements/private-method-comparison.case +// - src/class-elements/default/cls-decl.template +/*--- +description: PrivateFieldGet of a private method returns the same function object to every instance of a class (field definitions in a class declaration) +esid: prod-FieldDefinition +features: [class, class-methods-private] +flags: [generated] +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +---*/ + + +class C { + #m() { return 'test262'; } + + getPrivateMethod() { + return this.#m; + } + +} + +let c1 = new C(); +let c2 = new C(); + +assert.sameValue(c1.getPrivateMethod(), c2.getPrivateMethod()); From 696d87274b8aadcff203050f89be9113b63be4bc Mon Sep 17 00:00:00 2001 From: Caio Lima Date: Wed, 8 May 2019 18:26:43 -0300 Subject: [PATCH 2/3] Added case to with Function.prototype.call --- .../private-method-get-and-call.case | 45 ++++++++++++++++++ .../elements/private-method-comparison.js | 2 +- .../elements/private-method-get-and-call.js | 47 +++++++++++++++++++ .../elements/private-method-comparison.js | 2 +- .../elements/private-method-get-and-call.js | 47 +++++++++++++++++++ 5 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 src/class-elements/private-method-get-and-call.case create mode 100644 test/language/expressions/class/elements/private-method-get-and-call.js create mode 100644 test/language/statements/class/elements/private-method-get-and-call.js diff --git a/src/class-elements/private-method-get-and-call.case b/src/class-elements/private-method-get-and-call.case new file mode 100644 index 0000000000..de59c409c3 --- /dev/null +++ b/src/class-elements/private-method-get-and-call.case @@ -0,0 +1,45 @@ +// Copyright (C) 2019 Caio Lima (Igalia SL). All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +desc: Function returned by a private method can be called with other values as 'this' +esid: sec-privatefieldget +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +template: default +features: [class, class-methods-private] +---*/ + +//- elements +#m() { return this._v; } + +getPrivateMethod() { + return this.#m; +} + +//- assertions +let c = new C(); + +let o1 = {_v: 'test262'}; +let o2 = {_v: 'foo'}; +assert.sameValue(c.getPrivateMethod().call(o1), 'test262'); +assert.sameValue(c.getPrivateMethod().call(o2), 'foo'); diff --git a/test/language/expressions/class/elements/private-method-comparison.js b/test/language/expressions/class/elements/private-method-comparison.js index f8d56ac2ac..bec78b75b2 100644 --- a/test/language/expressions/class/elements/private-method-comparison.js +++ b/test/language/expressions/class/elements/private-method-comparison.js @@ -2,7 +2,7 @@ // - src/class-elements/private-method-comparison.case // - src/class-elements/default/cls-expr.template /*--- -description: PrivateFieldGet of a private method returns the same function object to every instance of a class (field definitions in a class expression) +description: PrivateFieldGet of a private method returns the same function object to every instance of the same class (field definitions in a class expression) esid: prod-FieldDefinition features: [class, class-methods-private] flags: [generated] diff --git a/test/language/expressions/class/elements/private-method-get-and-call.js b/test/language/expressions/class/elements/private-method-get-and-call.js new file mode 100644 index 0000000000..0d04e26a22 --- /dev/null +++ b/test/language/expressions/class/elements/private-method-get-and-call.js @@ -0,0 +1,47 @@ +// This file was procedurally generated from the following sources: +// - src/class-elements/private-method-get-and-call.case +// - src/class-elements/default/cls-expr.template +/*--- +description: Function returned by a private method can be called with other values as 'this' (field definitions in a class expression) +esid: prod-FieldDefinition +features: [class, class-methods-private] +flags: [generated] +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +---*/ + + +var C = class { + #m() { return this._v; } + + getPrivateMethod() { + return this.#m; + } + +} + +let c = new C(); + +let o1 = {_v: 'test262'}; +let o2 = {_v: 'foo'}; +assert.sameValue(c.getPrivateMethod().call(o1), 'test262'); +assert.sameValue(c.getPrivateMethod().call(o2), 'foo'); diff --git a/test/language/statements/class/elements/private-method-comparison.js b/test/language/statements/class/elements/private-method-comparison.js index ca368bb5e5..eda852a60a 100644 --- a/test/language/statements/class/elements/private-method-comparison.js +++ b/test/language/statements/class/elements/private-method-comparison.js @@ -2,7 +2,7 @@ // - src/class-elements/private-method-comparison.case // - src/class-elements/default/cls-decl.template /*--- -description: PrivateFieldGet of a private method returns the same function object to every instance of a class (field definitions in a class declaration) +description: PrivateFieldGet of a private method returns the same function object to every instance of the same class (field definitions in a class declaration) esid: prod-FieldDefinition features: [class, class-methods-private] flags: [generated] diff --git a/test/language/statements/class/elements/private-method-get-and-call.js b/test/language/statements/class/elements/private-method-get-and-call.js new file mode 100644 index 0000000000..02fb12c2fd --- /dev/null +++ b/test/language/statements/class/elements/private-method-get-and-call.js @@ -0,0 +1,47 @@ +// This file was procedurally generated from the following sources: +// - src/class-elements/private-method-get-and-call.case +// - src/class-elements/default/cls-decl.template +/*--- +description: Function returned by a private method can be called with other values as 'this' (field definitions in a class declaration) +esid: prod-FieldDefinition +features: [class, class-methods-private] +flags: [generated] +info: | + PrivateFieldGet (P, O) + 1. Assert: P is a Private Name. + 2. If O is not an object, throw a TypeError exception. + 3. If P.[[Kind]] is "field", + a. Let entry be PrivateFieldFind(P, O). + b. If entry is empty, throw a TypeError exception. + c. Return entry.[[PrivateFieldValue]]. + 4. Perform ? PrivateBrandCheck(O, P). + 5. If P.[[Kind]] is "method", + a. Return P.[[Value]]. + 6. Else, + a. Assert: P.[[Kind]] is "accessor". + b. If P does not have a [[Get]] field, throw a TypeError exception. + c. Let getter be P.[[Get]]. + d. Return ? Call(getter, O). + + PrivateBrandCheck(O, P) + 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, + a. Throw a TypeError exception. + +---*/ + + +class C { + #m() { return this._v; } + + getPrivateMethod() { + return this.#m; + } + +} + +let c = new C(); + +let o1 = {_v: 'test262'}; +let o2 = {_v: 'foo'}; +assert.sameValue(c.getPrivateMethod().call(o1), 'test262'); +assert.sameValue(c.getPrivateMethod().call(o2), 'foo'); From a038f7b2193db84d30c7196019185eaee7a709e1 Mon Sep 17 00:00:00 2001 From: Leo Balter Date: Wed, 22 May 2019 13:54:56 -0400 Subject: [PATCH 3/3] Fix yaml trailing line --- src/class-elements/private-method-comparison.case | 1 - src/class-elements/private-method-get-and-call.case | 1 - .../private-method-comparison-multiple-evaluations-of-class.js | 1 - 3 files changed, 3 deletions(-) diff --git a/src/class-elements/private-method-comparison.case b/src/class-elements/private-method-comparison.case index 81ff182936..db2a996019 100644 --- a/src/class-elements/private-method-comparison.case +++ b/src/class-elements/private-method-comparison.case @@ -24,7 +24,6 @@ info: | PrivateBrandCheck(O, P) 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, a. Throw a TypeError exception. - template: default features: [class, class-methods-private] ---*/ diff --git a/src/class-elements/private-method-get-and-call.case b/src/class-elements/private-method-get-and-call.case index de59c409c3..a1716544fa 100644 --- a/src/class-elements/private-method-get-and-call.case +++ b/src/class-elements/private-method-get-and-call.case @@ -24,7 +24,6 @@ info: | PrivateBrandCheck(O, P) 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, a. Throw a TypeError exception. - template: default features: [class, class-methods-private] ---*/ diff --git a/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js b/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js index fddc649805..14ca56857d 100644 --- a/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js +++ b/test/language/statements/class/elements/private-method-comparison-multiple-evaluations-of-class.js @@ -24,7 +24,6 @@ info: | PrivateBrandCheck(O, P) 1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true, a. Throw a TypeError exception. - features: [class, class-methods-private] ---*/