Merge pull request #2366 from bocoup/unnecessary-includes

Remove unnecessary "includes" directives
tc39 · Sep 27, 2019 · e2903e2 · e2903e2
2 parents 87e875f + 1e4e524
commit e2903e2
Show file tree

Hide file tree

Showing 84 changed files with 24 additions and 88 deletions.
diff --git a/src/async-generators/yield-spread-obj.case b/src/async-generators/yield-spread-obj.case
@@ -11,8 +11,6 @@ info: |
     (...)
     ...AssignmentExpression[In, ?Yield]
 features: [object-spread]
-includes:
-  - compareArray.js
 flags: [async]
 ---*/
 

diff --git a/src/dynamic-import/ns-extensible.case b/src/dynamic-import/ns-extensible.case
@@ -3,7 +3,6 @@
 /*---
 desc: Module namespace objects are not extensible.
 template: namespace
-includes: [propertyHelper.js]
 ---*/
 
 //- import

diff --git a/src/generators/yield-spread-obj.case b/src/generators/yield-spread-obj.case
@@ -11,8 +11,6 @@ info: |
     (...)
     ...AssignmentExpression[In, ?Yield]
 features: [object-spread]
-includes:
-  - compareArray.js
 ---*/
 
 //- body

diff --git a/test/built-ins/Array/prototype/includes/values-are-not-cached.js b/test/built-ins/Array/prototype/includes/values-are-not-cached.js
@@ -11,7 +11,6 @@ info: |
   7. Repeat, while k < len
     a. Let elementK be the result of ? Get(O, ! ToString(k)).
   ...
-includes: [compareArray.js]
 ---*/
 
 function getCleanObj() {

diff --git a/test/built-ins/ArrayIteratorPrototype/next/detach-typedarray-in-progress.js b/test/built-ins/ArrayIteratorPrototype/next/detach-typedarray-in-progress.js
@@ -18,7 +18,7 @@ testWithTypedArrayConstructors(TA => {
   var i = 0;
   assert.throws(TypeError, () => {
     for (let key of typedArray.keys()) {
-      $262.detachArrayBuffer(typedArray.buffer);
+      $DETACHBUFFER(typedArray.buffer);
       i++;
     }
   });

diff --git a/test/built-ins/AsyncGeneratorPrototype/return/return-promise.js b/test/built-ins/AsyncGeneratorPrototype/return/return-promise.js
@@ -18,7 +18,6 @@ info: |
   ...
   9. Return promiseCapability.[[Promise]].
 
-includes: [propertyHelper.js]
 features: [async-iteration]
 ---*/
 

diff --git a/test/built-ins/Atomics/notify/count-from-nans.js b/test/built-ins/Atomics/notify/count-from-nans.js
@@ -20,7 +20,7 @@ info: |
   2. If number is NaN, return +0.
   ...
 
-includes: [nans.js, atomicsHelper.js]
+includes: [nans.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 

diff --git a/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js b/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
@@ -5,7 +5,6 @@
 esid: sec-atomics.notify
 description: >
   Test Atomics.notify on non-shared integer TypedArrays
-includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
 

diff --git a/test/built-ins/Atomics/notify/non-shared-int-views.js b/test/built-ins/Atomics/notify/non-shared-int-views.js
@@ -5,7 +5,6 @@
 esid: sec-atomics.notify
 description: >
   Test Atomics.notify on non-shared integer TypedArrays
-includes: [testTypedArray.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 

diff --git a/test/built-ins/Atomics/wait/negative-index-throws.js b/test/built-ins/Atomics/wait/negative-index-throws.js
@@ -14,7 +14,6 @@ info: |
         ...
         2.b If integerIndex < 0, throw a RangeError exception
 
-includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 

diff --git a/test/built-ins/Atomics/wait/object-for-timeout.js b/test/built-ins/Atomics/wait/object-for-timeout.js
@@ -15,7 +15,6 @@ info: |
       Let primValue be ? ToPrimitive(argument, hint Number).
       Return ? ToNumber(primValue).
 
-includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, Symbol, Symbol.toPrimitive, TypedArray]
 flags: [CanBlockIsTrue]
 ---*/

diff --git a/test/built-ins/Date/parse/time-value-maximum-range.js b/test/built-ins/Date/parse/time-value-maximum-range.js
@@ -18,7 +18,6 @@ info: |
   smaller: exactly -100,000,000 days to 100,000,000 days measured relative to
   midnight at the beginning of 01 January, 1970 UTC. This gives a range of
   8,640,000,000,000,000 milliseconds to either side of 01 January, 1970 UTC.
-includes: [propertyHelper.js]
 ---*/
 
 const minDateStr = "-271821-04-20T00:00:00.000Z";

diff --git a/test/built-ins/Date/parse/zero.js b/test/built-ins/Date/parse/zero.js
@@ -18,7 +18,6 @@ info: |
   Date.parse(x.toString())
   Date.parse(x.toUTCString())
   Date.parse(x.toISOString())
-includes: [propertyHelper.js]
 ---*/
 
 const zero = new Date(0);

diff --git a/test/built-ins/FinalizationGroup/prototype/cleanupSome/iterator-holdings-multiple-values.js b/test/built-ins/FinalizationGroup/prototype/cleanupSome/iterator-holdings-multiple-values.js
@@ -29,7 +29,7 @@ info: |
     c. Return CreateIterResultObject(cell.[[Holdings]], false).
   9. Otherwise, return CreateIterResultObject(undefined, true).
 features: [FinalizationGroup, Symbol, host-gc-required]
-includes: [compareArray.js, async-gc.js]
+includes: [async-gc.js]
 flags: [async, non-deterministic]
 ---*/
 

diff --git a/test/built-ins/Function/prototype/toString/built-in-function-object.js b/test/built-ins/Function/prototype/toString/built-in-function-object.js
@@ -13,7 +13,7 @@ info: |
   NativeFunction:
     function IdentifierName_opt ( FormalParameters ) { [ native code ] }
 
-includes: [fnGlobalObject.js, nativeFunctionMatcher.js, wellKnownIntrinsicObjects.js]
+includes: [nativeFunctionMatcher.js, wellKnownIntrinsicObjects.js]
 features: [arrow-function]
 ---*/
 

diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js
@@ -18,9 +18,7 @@ Object.defineProperties(obj, {
   }
 });
 
-if (isWritable(obj, "prop")) {
-  $ERROR('Expected obj["prop"] not to be writable.');
-}
+verifyNotWritable(obj, "prop");
 
 if (!obj.hasOwnProperty("prop")) {
   $ERROR('Expected obj.hasOwnProperty("prop") to be true, actually ' + obj.hasOwnProperty("prop"));

diff --git a/test/built-ins/Promise/allSettled/resolve-non-thenable.js b/test/built-ins/Promise/allSettled/resolve-non-thenable.js
@@ -10,7 +10,7 @@ info: |
     a. Let valuesArray be ! CreateArrayFromList(values).
     b. Return ? Call(promiseCapability.[[Resolve]], undefined, « valuesArray »).
 flags: [async]
-includes: [compareArray.js, promiseHelper.js]
+includes: [promiseHelper.js]
 features: [Promise.allSettled]
 ---*/
 

diff --git a/test/built-ins/RegExp/match-indices/indices-array-element.js b/test/built-ins/RegExp/match-indices/indices-array-element.js
@@ -3,7 +3,6 @@
 
 /*---
 description: A matching element of indices is an Array with exactly two number properties.
-includes: [compareArray.js]
 esid: sec-getmatchindicesarray
 features: [regexp-match-indices]
 info: |

diff --git a/test/built-ins/String/prototype/matchAll/regexp-is-undefined-or-null-invokes-matchAll.js b/test/built-ins/String/prototype/matchAll/regexp-is-undefined-or-null-invokes-matchAll.js
@@ -12,7 +12,6 @@ info: |
     4. Let rx be ? RegExpCreate(R, "g").
     5. Return ? Invoke(rx, @@matchAll, « S »).
 features: [String.prototype.matchAll]
-includes: [compareArray.js, compareIterator.js, regExpUtils.js]
 ---*/
 
 var callCount = 0;

diff --git a/test/built-ins/String/prototype/matchAll/regexp-prototype-has-no-matchAll.js b/test/built-ins/String/prototype/matchAll/regexp-prototype-has-no-matchAll.js
@@ -15,7 +15,6 @@ info: |
     5. Return ? Invoke(rx, @@matchAll, « S »).
 
 features: [Symbol.matchAll, String.prototype.matchAll]
-includes: [compareArray.js, compareIterator.js, regExpUtils.js]
 ---*/
 
 assert.sameValue(typeof String.prototype.matchAll, "function");

diff --git a/test/built-ins/Symbol/prototype/description/description-symboldescriptivestring.js b/test/built-ins/Symbol/prototype/description/description-symboldescriptivestring.js
@@ -14,7 +14,6 @@ info: |
   Assert: Type(desc) is String.
   Return the string-concatenation of "Symbol(", desc, and ")".
 
-includes: [propertyHelper.js]
 features: [Symbol.prototype.description]
 ---*/
 

diff --git a/.../TypedArray/prototype/map/BigInt/callbackfn-no-interaction-over-non-integer-properties.js b/.../TypedArray/prototype/map/BigInt/callbackfn-no-interaction-over-non-integer-properties.js
@@ -14,7 +14,7 @@ info: |
     b. Let kValue be ? Get(O, Pk).
     c. Let mappedValue be ? Call(callbackfn, T, « kValue, k, O »).
   ...
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol, TypedArray]
 ---*/
 

diff --git a/...ilt-ins/TypedArray/prototype/map/callbackfn-no-interaction-over-non-integer-properties.js b/...ilt-ins/TypedArray/prototype/map/callbackfn-no-interaction-over-non-integer-properties.js
@@ -14,7 +14,7 @@ info: |
     b. Let kValue be ? Get(O, Pk).
     c. Let mappedValue be ? Call(callbackfn, T, « kValue, k, O »).
   ...
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [Symbol, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobigint64.js b/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobigint64.js
@@ -49,7 +49,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. If int64bit ≥ 2^63, return int64bit - 2^64; otherwise return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobiguint64.js b/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobiguint64.js
@@ -49,7 +49,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. Return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-empty-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new empty instance
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-same-length.js b/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-same-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new instance with the same length
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/slice/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/slice/results-with-empty-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new empty instance
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/slice/results-with-same-length.js b/test/built-ins/TypedArray/prototype/slice/results-with-same-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new instance with the same length
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/sort/sorted-values-nan.js b/test/built-ins/TypedArray/prototype/sort/sorted-values-nan.js
@@ -13,7 +13,7 @@ info: |
 
   NOTE: Because NaN always compares greater than any other value, NaN property
   values always sort to the end of the result when comparefn is not provided.
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-empty-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-same-length.js b/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-same-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/subarray/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/subarray/results-with-empty-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArray/prototype/subarray/results-with-same-length.js b/test/built-ins/TypedArray/prototype/subarray/results-with-same-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobigint64.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobigint64.js
@@ -59,7 +59,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. If int64bit ≥ 2^63, return int64bit - 2^64; otherwise return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobiguint64.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobiguint64.js
@@ -59,7 +59,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. Return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/...pedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js b/...pedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
@@ -36,7 +36,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
     {
       value: {
         valueOf: function() {
-          $262.detachArrayBuffer(ta.buffer);
+          $DETACHBUFFER(ta.buffer);
           return 42n;
         }
       }

diff --git a/...-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer.js b/...-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer.js
@@ -36,7 +36,7 @@ testWithTypedArrayConstructors(function(TA) {
     {
       value: {
         valueOf: function() {
-          $262.detachArrayBuffer(ta.buffer);
+          $DETACHBUFFER(ta.buffer);
           return 42;
         }
       }

diff --git a/...yConstructors/internals/HasProperty/BigInt/abrupt-from-ordinary-has-parent-hasproperty.js b/...yConstructors/internals/HasProperty/BigInt/abrupt-from-ordinary-has-parent-hasproperty.js
@@ -23,7 +23,7 @@ info: |
   5. If parent is not null, then
     a. Return ? parent.[[HasProperty]](P).
   6. Return false.
-includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, Reflect, Proxy, TypedArray]
 ---*/
 

diff --git a/...pedArrayConstructors/internals/HasProperty/abrupt-from-ordinary-has-parent-hasproperty.js b/...pedArrayConstructors/internals/HasProperty/abrupt-from-ordinary-has-parent-hasproperty.js
@@ -23,7 +23,7 @@ info: |
   5. If parent is not null, then
     a. Return ? parent.[[HasProperty]](P).
   6. Return false.
-includes: [testTypedArray.js, detachArrayBuffer.js]
+includes: [testTypedArray.js]
 features: [Reflect, Proxy, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobigint64.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobigint64.js
@@ -65,7 +65,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. If int64bit ≥ 2^63, return int64bit - 2^64; otherwise return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobiguint64.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobiguint64.js
@@ -65,7 +65,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. Return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 

diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer.js
@@ -32,7 +32,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     Reflect.set(ta, 0, {
       valueOf: function() {
-        $262.detachArrayBuffer(ta.buffer);
+        $DETACHBUFFER(ta.buffer);
         return 42n;
       }
     });

diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer.js
@@ -32,7 +32,7 @@ testWithTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     Reflect.set(ta, 0, {
       valueOf: function() {
-        $262.detachArrayBuffer(ta.buffer);
+        $DETACHBUFFER(ta.buffer);
         return 42;
       }
     });

diff --git a/test/built-ins/WeakMap/iterable.js b/test/built-ins/WeakMap/iterable.js
@@ -11,7 +11,6 @@ info: |
   9. Repeat
     k. Let status be Call(adder, map, «k.[[value]], v.[[value]]»).
     l. If status is an abrupt completion, return IteratorClose(iter, status).
-includes: [compareArray.js]
 ---*/
 
 var first = {};

diff --git a/test/built-ins/WeakSet/iterable.js b/test/built-ins/WeakSet/iterable.js
@@ -11,7 +11,6 @@ info: |
   9. Repeat
     f. Let status be Call(adder, set, «nextValue»).
     g. If status is an abrupt completion, return IteratorClose(iter, status).
-includes: [compareArray.js]
 ---*/
 
 var first = {};
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ info: | @@
       ...
 . Return promiseCapability.[[Promise]].
-    includes: [propertyHelper.js]
     features: [async-iteration]
     ---*/
@@ Expand Down @@