From f7c7d0f881d551adf00df5de281bea3f81260ae5 Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Tue, 5 Jun 2018 14:41:41 +0200 Subject: [PATCH] Bug 1435813 - Enable Array.prototype.flat and Array.prototype.flatMap in release builds. r=till --HG-- extra : rebase_source : adc7e839e4d241857a89df6c6669c241a14466da --- js/src/builtin/Array.cpp | 3 +-- js/src/tests/jstests.list | 5 ----- js/xpconnect/tests/chrome/test_xrayToJS.xul | 5 +---- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/js/src/builtin/Array.cpp b/js/src/builtin/Array.cpp index 2163d5218042..e61203a04b62 100644 --- a/js/src/builtin/Array.cpp +++ b/js/src/builtin/Array.cpp @@ -3553,10 +3553,9 @@ static const JSFunctionSpec array_methods[] = { /* ES7 additions */ JS_SELF_HOSTED_FN("includes", "ArrayIncludes", 2,0), -#ifdef NIGHTLY_BUILD + /* Future additions */ JS_SELF_HOSTED_FN("flatMap", "ArrayFlatMap", 1,0), JS_SELF_HOSTED_FN("flat", "ArrayFlat", 0,0), -#endif JS_FS_END }; diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list index 4b64917ccf32..517d905104ac 100644 --- a/js/src/tests/jstests.list +++ b/js/src/tests/jstests.list @@ -46,11 +46,6 @@ skip-if(!this.hasOwnProperty("SharedArrayBuffer")) script non262/SIMD/load-sab-b skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list -# flatMap and flatten are Nightly-only -skip-if(!Array.prototype.flatMap) include test262/built-ins/Array/prototype/flatMap/jstests.list -skip-if(!Array.prototype.flat) include test262/built-ins/Array/prototype/flat/jstests.list - - ##################################### # Test262 tests disabled on browser # ##################################### diff --git a/js/xpconnect/tests/chrome/test_xrayToJS.xul b/js/xpconnect/tests/chrome/test_xrayToJS.xul index 3526ecc9acce..1d554c967265 100644 --- a/js/xpconnect/tests/chrome/test_xrayToJS.xul +++ b/js/xpconnect/tests/chrome/test_xrayToJS.xul @@ -201,10 +201,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681 "pop", "shift", "unshift", "splice", "concat", "slice", "lastIndexOf", "indexOf", "includes", "forEach", "map", "reduce", "reduceRight", "filter", "some", "every", "find", "findIndex", "copyWithin", "fill", Symbol.iterator, Symbol.unscopables, "entries", "keys", - "values", "constructor"]; - if (isNightlyBuild) { - gPrototypeProperties['Array'].push("flat", "flatMap"); - } + "values", "constructor", "flat", "flatMap"]; gConstructorProperties['Array'] = constructorProps(["join", "reverse", "sort", "push", "pop", "shift", "unshift", "splice", "concat", "slice", "isArray",