Changeset 184582 in webkit for trunk/Source/JavaScriptCore/builtins/GlobalObject.js

Timestamp:

May 19, 2015, 12:51:46 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

Array.prototype methods must use ToLength
​https://bugs.webkit.org/show_bug.cgi?id=144128

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

Per ​https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength

This patch introduces ToLength and ToInteger JS implementation to encourage the DFG/FTL's inlining.
These implementations are located in GlobalObject.js.
And set to the JSGlobalObject with the private symbols @ToLength and @ToInteger manually.

• builtins/Array.prototype.js:

(every):
(forEach):
(filter):
(map):
(some):
(fill):
(find):
(findIndex):
(includes):

• builtins/ArrayConstructor.js:

(from):

• builtins/GlobalObject.js: Copied from Source/JavaScriptCore/builtins/StringConstructor.js.

(ToInteger):
(ToLength):

• builtins/StringConstructor.js:

(raw):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):

• runtime/JSGlobalObjectFunctions.h:

LayoutTests:

• fast/profiler/built-in-function-calls-anonymous-expected.txt:
• fast/profiler/built-in-function-calls-user-defined-function-expected.txt:
• js/array-every-expected.txt:
• js/array-fill-expected.txt:
• js/array-filter-expected.txt:
• js/array-find-expected.txt:
• js/array-findIndex-expected.txt:
• js/array-functions-non-arrays-expected.txt:
• js/array-includes-expected.txt:
• js/script-tests/array-every.js:

(throwError):

• js/script-tests/array-fill.js:

(throwError):

• js/script-tests/array-filter.js:

(throwError):

• js/script-tests/array-find.js:

(throwError):

• js/script-tests/array-findIndex.js:

(toObject):
(throwError):

• js/script-tests/array-functions-non-arrays.js:

(throwError):

• js/script-tests/array-includes.js:

File:

• trunk/Source/JavaScriptCore/builtins/GlobalObject.js (copied) (copied from trunk/Source/JavaScriptCore/builtins/StringConstructor.js ) (1 diff)

trunk/Source/JavaScriptCore/builtins/GlobalObject.js

@@ -24 +24 @@
  */
 
-function raw(template) {
+function ToInteger(target) {
     "use strict";
 
-    if (template === null || template === undefined)
-        throw new @TypeError("String.raw requires template not be null or undefined");
-    var cookedSegments = @Object(template);
+    var numberValue = @Number(target);
 
-    var rawValue = cookedSegments.raw;
-    if (rawValue === null || rawValue === undefined)
-        throw new @TypeError("String.raw requires template.raw not be null or undefined");
-    var rawSegments = @Object(rawValue);
+    // isNaN(numberValue)
+    if (numberValue !== numberValue)
+        return 0;
 
-    var numberOfSubstitutions = arguments.length - 1;
+    if (numberValue === 0 || !@isFinite(numberValue))
+        return numberValue;
+
+    return (numberValue > 0 ? 1 : -1) * @floor(@abs(numberValue));
+}
+
+function ToLength(target) {
+    "use strict";
 
     var maxSafeInteger = 0x1FFFFFFFFFFFFF;
-    var numberValue = @Number(rawSegments.length);
-    var lengthValue;
-    if (numberValue !== numberValue)  // isNaN(numberValue)
-        lengthValue = 0;
-    else if (numberValue === 0 || !@isFinite(numberValue))
-        lengthValue = numberValue;
-    else
-        lengthValue = (numberValue > 0 ? 1 : -1) * @floor(@abs(numberValue));
+    var length = @ToInteger(target);
     // originally Math.min(Math.max(length, 0), maxSafeInteger));
-    var segmentCount = lengthValue > 0 ? (lengthValue < maxSafeInteger ? lengthValue : maxSafeInteger) : 0;
-
-    if (segmentCount <= 0)
-        return '';
-
-    var stringElements = '';
-    for (var i = 0; ; ++i) {
-        var segment = @toString(rawSegments[i]);
-        stringElements += segment;
-
-        if ((i + 1) === segmentCount)
-            return stringElements;
-
-        if (i < numberOfSubstitutions) {
-            var substitutionIndexInArguments = i + 1;
-            var next = @toString(arguments[substitutionIndexInArguments]);
-            stringElements += next;
-        }
-    }
+    return length > 0 ? (length < maxSafeInteger ? length : maxSafeInteger) : 0;
 }