Changeset 198844 in webkit for trunk/Source/JavaScriptCore/builtins

Timestamp:

Mar 30, 2016, 10:55:24 AM (9 years ago)

Author:

[email protected]

Message:

Unreviewed, rollout r198808. The patch causes crashes on 32-bit and appears to be a JSBench regression.

File:

• trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js (modified) (1 diff)

trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js

@@ -647 +647 @@
 }
 
-function concatSlowPath()
-{
-    "use strict";
-
-    var argCount = arguments.length;
-    var result = new this.species(0);
-    var resultIsArray = @isJSArray(result);
-
-    var currentElement = this.array;
-    var resultIndex = 0;
-    var argIndex = 0;
-
-    do {
-        var spreadable = @isObject(currentElement) && currentElement[@symbolIsConcatSpreadable];
-        if ((spreadable == @undefined && @isArray(currentElement)) || spreadable) {
-            var length = @toLength(currentElement.length);
-            if (resultIsArray && @isJSArray(currentElement)
-                && @appendMemcpy(result, currentElement)) {
-
-                resultIndex += length;
-            } else {
-                if (length + resultIndex > @MAX_SAFE_INTEGER)
-                    throw @TypeError("length exceeded the maximum safe integer");
-                for (var i = 0; i < length; i++) {
-                    if (i in currentElement)
-                        @putByValDirect(result, resultIndex, currentElement[i]);
-                    resultIndex++;
-                }
-            }
-        } else {
-            if (resultIndex >= @MAX_SAFE_INTEGER)
-                throw @TypeError("length exceeded the maximum safe integer");
-            @putByValDirect(result, resultIndex++, currentElement);
-        }
-        currentElement = arguments[argIndex];
-    } while (argIndex++ < argCount);
-
-    result.length = resultIndex;
-    return result;
-}
-
-function concat(first)
-{
-    "use strict";
-
-    if (this == null) {
-        if (this === null)
-            throw new @TypeError("Array.prototype.concat requires that |this| not be null");
-        throw new @TypeError("Array.prototype.concat requires that |this| not be undefined");
-    }
-
-    var array = @Object(this);
-
-    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[@symbolSpecies];
-            if (constructor === null)
-                constructor = @Array;
-        }
-    }
-    if (constructor === @undefined)
-        constructor = @Array;
-
-    var result;
-    if (arguments.length === 1
-        && constructor === @Array
-        && @isJSArray(array)
-        && @isJSArray(first)
-        // FIXME: these get_by_ids should be "in"s but using "in" here is a 10% regression.
-        // https://bugs.webkit.org/show_bug.cgi?id=155590
-        && array[@symbolIsConcatSpreadable] == @undefined
-        && first[@symbolIsConcatSpreadable] == @undefined) {
-
-        result = @concatMemcpy(array, first);
-        if (result !== null)
-            return result;
-    }
-
-    return @concatSlowPath.@apply({ array: array, species: constructor }, arguments);
-}
-
 function copyWithin(target, start /*, end */)
 {