Changeset 228012 in webkit

Timestamp:

Feb 2, 2018 9:12:23 AM (6 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Clean up ArraySpeciesCreate
​https://bugs.webkit.org/show_bug.cgi?id=182434

Reviewed by Saam Barati.

We have duplicate code in filter, map, concatSlowPath.
This patch creates a new global private function @arraySpeciesCreate,
and use it.

• builtins/ArrayPrototype.js:

(globalPrivate.arraySpeciesCreate):
(filter):
(map):
(globalPrivate.concatSlowPath):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• builtins/ArrayPrototype.js (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-02-02  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSC] Clean up ArraySpeciesCreate
+        https://bugs.webkit.org/show_bug.cgi?id=182434
+
+        Reviewed by Saam Barati.
+
+        We have duplicate code in filter, map, concatSlowPath.
+        This patch creates a new global private function @arraySpeciesCreate,
+        and use it.
+
+        * builtins/ArrayPrototype.js:
+        (globalPrivate.arraySpeciesCreate):
+        (filter):
+        (map):
+        (globalPrivate.concatSlowPath):
+
 2018-02-01  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js

@@ -165 +165 @@
 }
 
-function filter(callback /*, thisArg */)
-{
-    "use strict";
-
-    var array = @toObject(this, "Array.prototype.filter requires that |this| not be null or undefined");
-    var length = @toLength(array.length);
-
-    if (typeof callback !== "function")
-        @throwTypeError("Array.prototype.filter callback must be a function");
-    
-    var thisArg = @argument(1);
-
-    // Do 9.4.2.3 ArraySpeciesCreate
-    var result;
+@globalPrivate
+function arraySpeciesCreate(array, length)
+{
+    "use strict";
+
     var constructor;
+    var arrayConstructorInRealm = @Array;
     if (@isArray(array)) {
         constructor = array.constructor;
@@ -185 +177 @@
         // calls this map they don't get an array with the Array.prototype of the
         // other global object.
-        if (@isArrayConstructor(constructor) && @Array !== constructor)
+        if (@isArrayConstructor(constructor) && arrayConstructorInRealm !== constructor)
             constructor = @undefined;
-        if (@isObject(constructor)) {
+        else if (@isObject(constructor)) {
             constructor = constructor.@speciesSymbol;
             if (constructor === null)
@@ -193 +185 @@
         }
     }
-    if (constructor === @Array || constructor === @undefined)
-        result = @newArrayWithSize(0);
-    else
-        result = new constructor(0);
+    if (constructor === arrayConstructorInRealm || constructor === @undefined)
+        return @newArrayWithSize(length);
+    return new constructor(length);
+}
+
+function filter(callback /*, thisArg */)
+{
+    "use strict";
+
+    var array = @toObject(this, "Array.prototype.filter requires that |this| not be null or undefined");
+    var length = @toLength(array.length);
+
+    if (typeof callback !== "function")
+        @throwTypeError("Array.prototype.filter callback must be a function");
+    
+    var thisArg = @argument(1);
+
+    var result = @arraySpeciesCreate(array, 0);
 
     var nextIndex = 0;
@@ -223 +229 @@
     var thisArg = @argument(1);
 
-    // Do 9.4.2.3 ArraySpeciesCreate
-    var result;
-    var constructor;
-    if (@isArray(array)) {
-        constructor = array.constructor;
-        // We have this check so that if some array from a different global object
-        // calls this map they don't get an array with the Array.prototype of the
-        // other global object.
-        if (@isArrayConstructor(constructor) && @Array !== constructor)
-            constructor = @undefined;
-        if (@isObject(constructor)) {
-            constructor = constructor.@speciesSymbol;
-            if (constructor === null)
-                constructor = @undefined;
-        }
-    }
-    if (constructor === @Array || constructor === @undefined)
-        result = @newArrayWithSize(length);
-    else
-        result = new constructor(length);
+    var result = @arraySpeciesCreate(array, length);
 
     for (var i = 0; i < length; i++) {
@@ -618 +605 @@
     var currentElement = @toObject(this, "Array.prototype.concat requires that |this| not be null or undefined");
 
-    var constructor;
-    if (@isArray(currentElement)) {
-        constructor = currentElement.constructor;
-        // We have this check so that if some array from a different global object
-        // calls this map they don't get an array with the Array.prototype of the
-        // other global object.
-        if (@isArrayConstructor(constructor) && @Array !== constructor)
-            constructor = @undefined;
-        else if (@isObject(constructor)) {
-            constructor = constructor.@speciesSymbol;
-            if (constructor === null)
-                constructor = @Array;
-        }
-    }
+    var result = @arraySpeciesCreate(currentElement, 0);
+    var resultIsArray = @isJSArray(result);
 
     var argCount = arguments.length;
-    var result;
-    if (constructor === @Array || constructor === @undefined)
-        result = @newArrayWithSize(0);
-    else
-        result = new constructor(0);
-    var resultIsArray = @isJSArray(result);
 
     var resultIndex = 0;