patch_remove_Array-group.diff

diff --git a/js/src/builtin/Array.cpp b/js/src/builtin/Array.cpp
--- a/js/src/builtin/Array.cpp
+++ b/js/src/builtin/Array.cpp
@@ -4584,10 +4584,7 @@ static const JSFunctionSpec array_method
     JS_SELF_HOSTED_FN("forEach", "ArrayForEach", 1, 0),
     JS_SELF_HOSTED_FN("map", "ArrayMap", 1, 0),
     JS_SELF_HOSTED_FN("filter", "ArrayFilter", 1, 0),
-#ifdef NIGHTLY_BUILD
-    JS_SELF_HOSTED_FN("group", "ArrayGroup", 1, 0),
-    JS_SELF_HOSTED_FN("groupToMap", "ArrayGroupToMap", 1, 0),
-#endif
+
     JS_SELF_HOSTED_FN("reduce", "ArrayReduce", 1, 0),
     JS_SELF_HOSTED_FN("reduceRight", "ArrayReduceRight", 1, 0),
     JS_SELF_HOSTED_FN("some", "ArraySome", 1, 0),
diff --git a/js/src/builtin/Array.js b/js/src/builtin/Array.js
--- a/js/src/builtin/Array.js
+++ b/js/src/builtin/Array.js
@@ -271,142 +271,7 @@ function ArrayFilter(callbackfn /*, this
   return A;
 }
 
-#ifdef NIGHTLY_BUILD
-// Array Grouping proposal
-//
-// Array.prototype.group
-// https://tc39.es/proposal-array-grouping/#sec-array.prototype.group
-function ArrayGroup(callbackfn /*, thisArg*/) {
-  /* Step 1. Let O be ? ToObject(this value). */
-  var O = ToObject(this);
 
-  /* Step 2. Let len be ? LengthOfArrayLike(O). */
-  var len = ToLength(O.length);
-
-  /* Step 3. If IsCallable(callbackfn) is false, throw a TypeError exception. */
-  if (!IsCallable(callbackfn)) {
-    ThrowTypeError(JSMSG_NOT_FUNCTION, DecompileArg(0, callbackfn));
-  }
-
-  /* Step 5. Let groups be a new empty List. */
-  // Not applicable in our implementation.
-
-  /* Step 7. Let obj be ! OrdinaryObjectCreate(null). */
-  var object = std_Object_create(null);
-
-  var thisArg = arguments.length > 1 ? arguments[1] : undefined;
-
-  /* Steps 4, 6. */
-  for (var k = 0; k < len; k++) {
-    /* Skip Step 6.a. Let Pk be ! ToString(𝔽(k)).
-     *
-     * k is coerced into a string through the property access. */
-
-    /* Step 6.b. Let kValue be ? Get(O, Pk). */
-    var kValue = O[k];
-
-    /* Step 6.c.
-     * Let propertyKey be ? ToPropertyKey(
-     *   ? Call(callbackfn, thisArg, « kValue, 𝔽(k), O »)).
-     */
-    var propertyKey = TO_PROPERTY_KEY(
-      callContentFunction(callbackfn, thisArg, kValue, k, O)
-    );
-
-    /* Step 6.d. Perform ! AddValueToKeyedGroup(groups, propertyKey, kValue). */
-    var elements = object[propertyKey];
-    if (elements === undefined) {
-      DefineDataProperty(object, propertyKey, [kValue]);
-    } else {
-      DefineDataProperty(elements, elements.length, kValue);
-    }
-  }
-
-  /* Step 8. For each Record { [[Key]], [[Elements]] } g of groups, do
-   *  a. Let elements be ! CreateArrayFromList(g.[[Elements]]).
-   *  b. Perform ! CreateDataPropertyOrThrow(obj, g.[[Key]], elements).
-   */
-  // Not applicable in our implementation.
-
-  /* Step 9. Return obj. */
-  return object;
-}
-
-// Array Grouping proposal
-//
-// Array.prototype.groupToMap
-// https://tc39.es/proposal-array-grouping/#sec-array.prototype.grouptomap
-function ArrayGroupToMap(callbackfn /*, thisArg*/) {
-  /* Step 1. Let O be ? ToObject(this value). */
-  var O = ToObject(this);
-
-  /* Step 2. Let len be ? LengthOfArrayLike(O). */
-  var len = ToLength(O.length);
-
-  /* Step 3.
-   * If IsCallable(callbackfn) is false, throw a TypeError exception.
-   */
-  if (!IsCallable(callbackfn)) {
-    ThrowTypeError(JSMSG_NOT_FUNCTION, DecompileArg(0, callbackfn));
-  }
-
-  /* Skipping Step 5. Let groups be a new empty List.
-   *
-   * Intermediate object isn't necessary as we have direct access
-   * to the map constructor and set/get methods.
-   */
-
-  /* Step 7. Let map be ! Construct(%Map%). */
-  var C = GetBuiltinConstructor("Map");
-  var map = new C();
-
-  var thisArg = arguments.length > 1 ? arguments[1] : undefined;
-
-  /* Combine Step 6. and Step 8.
-   *
-   * We have direct access to the map constructor and set/get methods.
-   * We can treat these two loops as one, as there isn't a risk that user
-   * polyfilling will impact the implementation.
-   */
-  for (var k = 0; k < len; k++) {
-    /* Skipping Step 6.a. Let Pk be ! ToString(𝔽(k)).
-     *
-     * Value is coerced to String by property access in step 6.b.
-     */
-
-    /* Step 6.b. Let kValue be ? Get(O, Pk). */
-    var kValue = O[k];
-
-    /* Step 6.c.
-     * Let key be ? Call(callbackfn, thisArg, « kValue, 𝔽(k), O »).
-     */
-    var key = callContentFunction(callbackfn, thisArg, kValue, k, O);
-
-    /* Skipping Step 6.d. If key is -0𝔽, set key to +0𝔽.
-     *
-     * This step is performed by std_Map_set.
-     */
-
-    /* Step 8.c. Append entry as the last element of map.[[MapData]].
-     *
-     * We are not using an intermediate object to store the values.
-     * So, this step applies it directly to the map object. Skips steps
-     * 6.e (Perform ! AddValueToKeyedGroup(groups, key, kValue))
-     * and 8.a-b as a result.
-     */
-    var elements = callFunction(std_Map_get, map, key);
-    if (elements === undefined) {
-      callFunction(std_Map_set, map, key, [kValue]);
-    } else {
-      DefineDataProperty(elements, elements.length, kValue);
-    }
-  }
-
-  /* Step 9. Return map. */
-  return map;
-}
-
-#endif
 
 /* ES5 15.4.4.21. */
 function ArrayReduce(callbackfn /*, initialValue*/) {