diff --git a/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertynames.js b/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertynames.js
index b7bde1412ef169c7f94c3d1eb39c03e647ead69d..9ddf4c8652d50093171f0f2ff356b6e7955fb237 100644
--- a/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertynames.js
+++ b/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertynames.js
@@ -1,11 +1,11 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
[[OwnPropertyKeys]] ( )
- 8. Let trapResultArray be Call(trap, handler, «target»).
+ 7. Let trapResultArray be ? Call(trap, handler, « target »).
---*/
var _target, _handler;
diff --git a/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertysymbols.js b/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertysymbols.js
index 39f3c7bd7585ee7167603c64ab2861b46e76aaa1..ea802c424da704bbece050184d273666ff347680 100644
--- a/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertysymbols.js
+++ b/test/built-ins/Proxy/ownKeys/call-parameters-object-getownpropertysymbols.js
@@ -1,11 +1,12 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
[[OwnPropertyKeys]] ( )
- 8. Let trapResultArray be Call(trap, handler, «target»).
+ 7. Let trapResultArray be ? Call(trap, handler, « target »).
+
features: [Symbol]
---*/
diff --git a/test/built-ins/Proxy/ownKeys/call-parameters-object-keys.js b/test/built-ins/Proxy/ownKeys/call-parameters-object-keys.js
index 0db31999b9ff551098cd335b4a4780b455311b93..9ea0cdf6c49e218b2c6526ce92ef1c0af4579b20 100644
--- a/test/built-ins/Proxy/ownKeys/call-parameters-object-keys.js
+++ b/test/built-ins/Proxy/ownKeys/call-parameters-object-keys.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
[[OwnPropertyKeys]] ( )
diff --git a/test/built-ins/Proxy/ownKeys/extensible-return-trap-result-absent-not-configurable-keys.js b/test/built-ins/Proxy/ownKeys/extensible-return-trap-result-absent-not-configurable-keys.js
index c17002ebb08389b0488f818a13eda8fdad326cbe..b7a11e4cbc280eacf6a1ddaa06ea983243596cd5 100644
--- a/test/built-ins/Proxy/ownKeys/extensible-return-trap-result-absent-not-configurable-keys.js
+++ b/test/built-ins/Proxy/ownKeys/extensible-return-trap-result-absent-not-configurable-keys.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
If target is extensible, return the non-falsy trap result if target doesn't
contain any non-configurable keys.
@@ -9,7 +9,7 @@ info: >
[[OwnPropertyKeys]] ( )
...
- 19. If extensibleTarget is true and targetNonconfigurableKeys is empty, then
+ 15. If extensibleTarget is true and targetNonconfigurableKeys is empty, then
a. Return trapResult.
---*/
diff --git a/test/built-ins/Proxy/ownKeys/extensible-return-trap-result.js b/test/built-ins/Proxy/ownKeys/extensible-return-trap-result.js
index b99a3ad13d7f95d90be27abb2919899975ab1896..f69b394e399a5349d288410e0c76b5770b17553f 100644
--- a/test/built-ins/Proxy/ownKeys/extensible-return-trap-result.js
+++ b/test/built-ins/Proxy/ownKeys/extensible-return-trap-result.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
If target is extensible, return the non-falsy trap result if it contains all
of target's non-configurable keys.
@@ -9,7 +9,7 @@ info: >
[[OwnPropertyKeys]] ( )
...
- 22. If extensibleTarget is true, return trapResult.
+ 18. If extensibleTarget is true, return trapResult.
---*/
var target = {};
diff --git a/test/built-ins/Proxy/ownKeys/not-extensible-missing-keys-throws.js b/test/built-ins/Proxy/ownKeys/not-extensible-missing-keys-throws.js
index 6da38c0d8b245c807c52d5552f67273539aef45f..469c9502a9ba8150b4b2f35403d8f8339444604e 100644
--- a/test/built-ins/Proxy/ownKeys/not-extensible-missing-keys-throws.js
+++ b/test/built-ins/Proxy/ownKeys/not-extensible-missing-keys-throws.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
If target is not extensible, the result must contain all the keys of the own
properties of the target object.
@@ -9,7 +9,7 @@ info: >
[[OwnPropertyKeys]] ( )
...
- 23. Repeat, for each key that is an element of targetConfigurableKeys,
+ 19. For each key that is an element of targetConfigurableKeys, do
a. If key is not an element of uncheckedResultKeys, throw a TypeError
exception.
---*/
diff --git a/test/built-ins/Proxy/ownKeys/not-extensible-new-keys-throws.js b/test/built-ins/Proxy/ownKeys/not-extensible-new-keys-throws.js
index d00c536f6690b123639fe414237a01f21f586075..880745712d2d4dcf800bde5da574466378a912b2 100644
--- a/test/built-ins/Proxy/ownKeys/not-extensible-new-keys-throws.js
+++ b/test/built-ins/Proxy/ownKeys/not-extensible-new-keys-throws.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
If target is not extensible, the result can't contain keys names not
contained in the target object.
@@ -9,7 +9,7 @@ info: >
[[OwnPropertyKeys]] ( )
...
- 24. If uncheckedResultKeys is not empty, throw a TypeError exception.
+ 20. If uncheckedResultKeys is not empty, throw a TypeError exception.
---*/
var target = {
diff --git a/test/built-ins/Proxy/ownKeys/not-extensible-return-keys.js b/test/built-ins/Proxy/ownKeys/not-extensible-return-keys.js
index c1ad2af7deb2575a5d80a4692de22d5ff3b8ac28..00c8a3208ee4b433afd916f0242c30ce53d638c7 100644
--- a/test/built-ins/Proxy/ownKeys/not-extensible-return-keys.js
+++ b/test/built-ins/Proxy/ownKeys/not-extensible-return-keys.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
If target is not extensible, the result must contain all the keys of the own
properties of the target object and no other values
@@ -9,7 +9,7 @@ info: >
[[OwnPropertyKeys]] ( )
...
- 25. Return trapResult.
+ 21. Return trapResult.
---*/
var target = {
diff --git a/test/built-ins/Proxy/ownKeys/null-handler.js b/test/built-ins/Proxy/ownKeys/null-handler.js
index 91e1b224ac952b725b9ea5b92d935015f5ddf95e..e703ece13a8180ce5afbff697f361755fd3c8423 100644
--- a/test/built-ins/Proxy/ownKeys/null-handler.js
+++ b/test/built-ins/Proxy/ownKeys/null-handler.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
[[OwnPropertyKeys]] ( )
diff --git a/test/built-ins/Proxy/ownKeys/return-all-non-configurable-keys.js b/test/built-ins/Proxy/ownKeys/return-all-non-configurable-keys.js
index a8e4e9958ac868164867e7102bf42907460c6ed5..7b7fb11cdb06b13d67c168ce368bd61bfdc97764 100644
--- a/test/built-ins/Proxy/ownKeys/return-all-non-configurable-keys.js
+++ b/test/built-ins/Proxy/ownKeys/return-all-non-configurable-keys.js
@@ -1,7 +1,7 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
The result List must contain the keys of all non-configurable own properties
of the target object.
@@ -9,9 +9,10 @@ info: >
[[OwnPropertyKeys]] ( )
...
- 21. Repeat, for each key that is an element of targetNonconfigurableKeys,
+ 17. For each key that is an element of targetNonconfigurableKeys, do
a. If key is not an element of uncheckedResultKeys, throw a TypeError
exception.
+
---*/
var target = {
diff --git a/test/built-ins/Proxy/ownKeys/return-is-abrupt.js b/test/built-ins/Proxy/ownKeys/return-is-abrupt.js
index 5e56c98e0cf20d2e803599bff6c7f5bfb2921713..fffaca5f21089cc06480a273e1f8bd50ef05ecff 100644
--- a/test/built-ins/Proxy/ownKeys/return-is-abrupt.js
+++ b/test/built-ins/Proxy/ownKeys/return-is-abrupt.js
@@ -1,19 +1,16 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
Trap returns abrupt.
info: >
[[OwnPropertyKeys]] ( )
...
- 8. Let trapResultArray be Call(trap, handler, «target»).
- 9. Let trapResult be CreateListFromArrayLike(trapResultArray, «â€String, Symbol»).
- 7.3.17 CreateListFromArrayLike (obj [, elementTypes] )
+ 7. Let trapResultArray be ? Call(trap, handler, « target »).
+ 8. Let trapResult be ? CreateListFromArrayLike(trapResultArray, « String, Symbol »).
- 1. ReturnIfAbrupt(obj).
- ...
---*/
var p = new Proxy({}, {
diff --git a/test/built-ins/Proxy/ownKeys/return-not-list-object-throws-realm.js b/test/built-ins/Proxy/ownKeys/return-not-list-object-throws-realm.js
index 20d7931d7314a1766eedd540a6b958665a9b2381..ba459597118d1edd353f4f9ecb39bbd1142ec179 100644
--- a/test/built-ins/Proxy/ownKeys/return-not-list-object-throws-realm.js
+++ b/test/built-ins/Proxy/ownKeys/return-not-list-object-throws-realm.js
@@ -2,7 +2,6 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
-es6id: 9.5.12
description: >
If return is not a list object, throw a TypeError exception (honoring
the Realm of the current execution context)
@@ -13,10 +12,11 @@ info: |
Symbol »).
...
+ #sec-createlistfromarraylike
7.3.17 CreateListFromArrayLike (obj [, elementTypes] )
- ...
- 3. If Type(obj) is not Object, throw a TypeError exception.
+ 2. If Type(obj) is not Object, throw a TypeError exception.
+
features: [Symbol]
---*/
diff --git a/test/built-ins/Proxy/ownKeys/return-not-list-object-throws.js b/test/built-ins/Proxy/ownKeys/return-not-list-object-throws.js
index 147b0b05d6ece65568d7cc9ddd809c925eb15c7e..73036259805fab186234d2f1f4ec1456063c1ce3 100644
--- a/test/built-ins/Proxy/ownKeys/return-not-list-object-throws.js
+++ b/test/built-ins/Proxy/ownKeys/return-not-list-object-throws.js
@@ -1,18 +1,22 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
If return is not a list object, throw a TypeError exception
info: >
[[OwnPropertyKeys]] ( )
- 8. Let trapResultArray be Call(trap, handler, «target»).
- 9. Let trapResult be CreateListFromArrayLike(trapResultArray, «â€String,
- Symbol»).
+ 7. Let trapResultArray be ? Call(trap, handler, « target »).
+ 8. Let trapResult be ? CreateListFromArrayLike(trapResultArray, « String,
+ Symbol »).
...
- 7.3.17 CreateListFromArrayLike (obj [, elementTypes] )
- 3. If Type(obj) is not Object, throw a TypeError exception.
+
+ #sec-createlistfromarraylike
+ 7.3.17 CreateListFromArrayLike (obj [, elementTypes] )
+
+ 2. If Type(obj) is not Object, throw a TypeError exception.
+
features: [Symbol]
---*/
diff --git a/test/built-ins/Proxy/ownKeys/trap-is-not-callable-realm.js b/test/built-ins/Proxy/ownKeys/trap-is-not-callable-realm.js
index 6db03b0f35138d74ba9e6e43bb33656ac684662c..1cc6c5d6e5575398e99245355e7e27af36865dd5 100644
--- a/test/built-ins/Proxy/ownKeys/trap-is-not-callable-realm.js
+++ b/test/built-ins/Proxy/ownKeys/trap-is-not-callable-realm.js
@@ -2,7 +2,6 @@
// This code is governed by the BSD license found in the LICENSE file.
/*---
esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
-es6id: 9.5.12
description: >
Throws if trap is not callable (honoring the Realm of the current execution
context)
@@ -12,9 +11,10 @@ info: |
5. Let trap be GetMethod(handler, "ownKeys").
...
+ #sec-getmethod
7.3.9 GetMethod (O, P)
- 5. If IsCallable(func) is false, throw a TypeError exception.
+ 4. If IsCallable(func) is false, throw a TypeError exception.
---*/
var OProxy = $262.createRealm().global.Proxy;
diff --git a/test/built-ins/Proxy/ownKeys/trap-is-not-callable.js b/test/built-ins/Proxy/ownKeys/trap-is-not-callable.js
index 417b675d1be749ac60736d96677d1ec5a238264d..1cb7fdb6464c4f5ef2477b9fffab98ed6966098b 100644
--- a/test/built-ins/Proxy/ownKeys/trap-is-not-callable.js
+++ b/test/built-ins/Proxy/ownKeys/trap-is-not-callable.js
@@ -1,18 +1,19 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
Trap is not callable.
info: >
[[OwnPropertyKeys]] ( )
- 5. Let trap be GetMethod(handler, "ownKeys").
+ 5. Let trap be ? GetMethod(handler, "ownKeys").
...
+ #sec-getmethod
7.3.9 GetMethod (O, P)
- 5. If IsCallable(func) is false, throw a TypeError exception.
+ 4. If IsCallable(func) is false, throw a TypeError exception.
---*/
var p = new Proxy({attr:1}, {
diff --git a/test/built-ins/Proxy/ownKeys/trap-is-undefined.js b/test/built-ins/Proxy/ownKeys/trap-is-undefined.js
index ec95ac21b87c8b1a9770ffeb02d604833f8fb8df..2b983026219e89c98776670c76eb11eeb4b5886c 100644
--- a/test/built-ins/Proxy/ownKeys/trap-is-undefined.js
+++ b/test/built-ins/Proxy/ownKeys/trap-is-undefined.js
@@ -1,11 +1,11 @@
// Copyright (C) 2015 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
/*---
-es6id: 9.5.12
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
description: >
[[OwnPropertyKeys]] ( )
- 7. If trap is undefined, then Return target.[[OwnPropertyKeys]]()
+ 6. If trap is undefined, then Return target.[[OwnPropertyKeys]]()
---*/
var target = {