Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/js/array.js b/src/js/array.js
index f9cf161..0a5e283 100644
--- a/src/js/array.js
+++ b/src/js/array.js
@@ -12,7 +12,6 @@
// Imports
var AddIndexedProperty;
-var FLAG_harmony_tolength;
var FLAG_harmony_species;
var GetIterator;
var GetMethod;
@@ -28,7 +27,6 @@
var ObserveBeginPerformSplice;
var ObserveEndPerformSplice;
var ObserveEnqueueSpliceRecord;
-var SameValueZero;
var iteratorSymbol = utils.ImportNow("iterator_symbol");
var unscopablesSymbol = utils.ImportNow("unscopables_symbol");
@@ -44,11 +42,9 @@
ObserveBeginPerformSplice = from.ObserveBeginPerformSplice;
ObserveEndPerformSplice = from.ObserveEndPerformSplice;
ObserveEnqueueSpliceRecord = from.ObserveEnqueueSpliceRecord;
- SameValueZero = from.SameValueZero;
});
utils.ImportFromExperimental(function(from) {
- FLAG_harmony_tolength = from.FLAG_harmony_tolength;
FLAG_harmony_species = from.FLAG_harmony_species;
});
@@ -213,8 +209,6 @@
elements[elements_length++] = e;
}
elements.length = elements_length;
- var result = %_FastOneByteArrayJoin(elements, '');
- if (!IS_UNDEFINED(result)) return result;
return %StringBuilderConcat(elements, elements_length, '');
}
// Non-empty separator case.
@@ -237,9 +231,6 @@
elements[i] = e;
}
}
- var result = %_FastOneByteArrayJoin(elements, separator);
- if (!IS_UNDEFINED(result)) return result;
-
return %StringBuilderJoin(elements, length, separator);
} finally {
// Make sure to remove the last element of the visited array no
@@ -431,7 +422,7 @@
function InnerArrayToLocaleString(array, length) {
- var len = TO_LENGTH_OR_UINT32(length);
+ var len = TO_LENGTH(length);
if (len === 0) return "";
return Join(array, len, ',', ConvertToLocaleString);
}
@@ -451,9 +442,6 @@
separator = TO_STRING(separator);
}
- var result = %_FastOneByteArrayJoin(array, separator);
- if (!IS_UNDEFINED(result)) return result;
-
// Fast case for one-element arrays.
if (length === 1) {
var e = array[0];
@@ -469,7 +457,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.join");
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArrayJoin(separator, array, length);
}
@@ -498,7 +486,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.pop");
var array = TO_OBJECT(this);
- var n = TO_LENGTH_OR_UINT32(array.length);
+ var n = TO_LENGTH(array.length);
if (n == 0) {
array.length = n;
return;
@@ -516,13 +504,13 @@
function ObservedArrayPush() {
- var n = TO_LENGTH_OR_UINT32(this.length);
- var m = %_ArgumentsLength();
+ var n = TO_LENGTH(this.length);
+ var m = arguments.length;
try {
ObserveBeginPerformSplice(this);
for (var i = 0; i < m; i++) {
- this[i+n] = %_Arguments(i);
+ this[i+n] = arguments[i];
}
var new_length = n + m;
this.length = new_length;
@@ -544,8 +532,8 @@
return ObservedArrayPush.apply(this, arguments);
var array = TO_OBJECT(this);
- var n = TO_LENGTH_OR_UINT32(array.length);
- var m = %_ArgumentsLength();
+ var n = TO_LENGTH(array.length);
+ var m = arguments.length;
// It appears that there is no enforced, absolute limit on the number of
// arguments, but it would surely blow the stack to use 2**30 or more.
@@ -557,7 +545,7 @@
}
for (var i = 0; i < m; i++) {
- array[i+n] = %_Arguments(i);
+ array[i+n] = arguments[i];
}
var new_length = n + m;
@@ -650,7 +638,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.reverse");
var array = TO_OBJECT(this);
- var len = TO_LENGTH_OR_UINT32(array.length);
+ var len = TO_LENGTH(array.length);
var isArray = IS_ARRAY(array);
if (UseSparseVariant(array, len, isArray, len)) {
@@ -685,7 +673,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.shift");
var array = TO_OBJECT(this);
- var len = TO_LENGTH_OR_UINT32(array.length);
+ var len = TO_LENGTH(array.length);
if (len === 0) {
array.length = 0;
@@ -712,14 +700,14 @@
function ObservedArrayUnshift() {
- var len = TO_LENGTH_OR_UINT32(this.length);
- var num_arguments = %_ArgumentsLength();
+ var len = TO_LENGTH(this.length);
+ var num_arguments = arguments.length;
try {
ObserveBeginPerformSplice(this);
SimpleMove(this, 0, 0, len, num_arguments);
for (var i = 0; i < num_arguments; i++) {
- this[i] = %_Arguments(i);
+ this[i] = arguments[i];
}
var new_length = len + num_arguments;
this.length = new_length;
@@ -739,8 +727,8 @@
return ObservedArrayUnshift.apply(this, arguments);
var array = TO_OBJECT(this);
- var len = TO_LENGTH_OR_UINT32(array.length);
- var num_arguments = %_ArgumentsLength();
+ var len = TO_LENGTH(array.length);
+ var num_arguments = arguments.length;
if (len > 0 && UseSparseVariant(array, len, IS_ARRAY(array), len) &&
!%object_is_sealed(array)) {
@@ -750,7 +738,7 @@
}
for (var i = 0; i < num_arguments; i++) {
- array[i] = %_Arguments(i);
+ array[i] = arguments[i];
}
var new_length = len + num_arguments;
@@ -763,7 +751,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.slice");
var array = TO_OBJECT(this);
- var len = TO_LENGTH_OR_UINT32(array.length);
+ var len = TO_LENGTH(array.length);
var start_i = TO_INTEGER(start);
var end_i = len;
@@ -833,8 +821,8 @@
function ObservedArraySplice(start, delete_count) {
- var num_arguments = %_ArgumentsLength();
- var len = TO_LENGTH_OR_UINT32(this.length);
+ var num_arguments = arguments.length;
+ var len = TO_LENGTH(this.length);
var start_i = ComputeSpliceStartIndex(TO_INTEGER(start), len);
var del_count = ComputeSpliceDeleteCount(delete_count, num_arguments, len,
start_i);
@@ -852,9 +840,9 @@
// place of the deleted elements.
var i = start_i;
var arguments_index = 2;
- var arguments_length = %_ArgumentsLength();
+ var arguments_length = arguments.length;
while (arguments_index < arguments_length) {
- this[i++] = %_Arguments(arguments_index++);
+ this[i++] = arguments[arguments_index++];
}
this.length = len - del_count + num_elements_to_add;
@@ -879,9 +867,9 @@
if (%IsObserved(this))
return ObservedArraySplice.apply(this, arguments);
- var num_arguments = %_ArgumentsLength();
+ var num_arguments = arguments.length;
var array = TO_OBJECT(this);
- var len = TO_LENGTH_OR_UINT32(array.length);
+ var len = TO_LENGTH(array.length);
var start_i = ComputeSpliceStartIndex(TO_INTEGER(start), len);
var del_count = ComputeSpliceDeleteCount(delete_count, num_arguments, len,
start_i);
@@ -915,9 +903,9 @@
// place of the deleted elements.
var i = start_i;
var arguments_index = 2;
- var arguments_length = %_ArgumentsLength();
+ var arguments_length = arguments.length;
while (arguments_index < arguments_length) {
- array[i++] = %_Arguments(arguments_index++);
+ array[i++] = arguments[arguments_index++];
}
array.length = len - del_count + num_elements_to_add;
@@ -1068,7 +1056,7 @@
var CopyFromPrototype = function CopyFromPrototype(obj, length) {
var max = 0;
for (var proto = %_GetPrototype(obj); proto; proto = %_GetPrototype(proto)) {
- var indices = %GetArrayKeys(proto, length);
+ var indices = IS_PROXY(proto) ? length : %GetArrayKeys(proto, length);
if (IS_NUMBER(indices)) {
// It's an interval.
var proto_length = indices;
@@ -1097,7 +1085,7 @@
// elements in that range.
var ShadowPrototypeElements = function(obj, from, to) {
for (var proto = %_GetPrototype(obj); proto; proto = %_GetPrototype(proto)) {
- var indices = %GetArrayKeys(proto, to);
+ var indices = IS_PROXY(proto) ? to : %GetArrayKeys(proto, to);
if (IS_NUMBER(indices)) {
// It's an interval.
var proto_length = indices;
@@ -1217,7 +1205,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.sort");
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArraySort(array, length, comparefn);
}
@@ -1248,7 +1236,7 @@
// Pull out the length so that modifications to the length in the
// loop will not affect the looping and side effects are visible.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
if (!IS_CALLABLE(f)) throw MakeTypeError(kCalledNonCallable, f);
var result = ArraySpeciesCreate(array, 0);
return InnerArrayFilter(f, receiver, array, length, result);
@@ -1274,7 +1262,7 @@
// Pull out the length so that modifications to the length in the
// loop will not affect the looping and side effects are visible.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
InnerArrayForEach(f, receiver, array, length);
}
@@ -1301,7 +1289,7 @@
// Pull out the length so that modifications to the length in the
// loop will not affect the looping and side effects are visible.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArraySome(f, receiver, array, length);
}
@@ -1325,7 +1313,7 @@
// Pull out the length so that modifications to the length in the
// loop will not affect the looping and side effects are visible.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArrayEvery(f, receiver, array, length);
}
@@ -1336,7 +1324,7 @@
// Pull out the length so that modifications to the length in the
// loop will not affect the looping and side effects are visible.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
if (!IS_CALLABLE(f)) throw MakeTypeError(kCalledNonCallable, f);
var result = ArraySpeciesCreate(array, length);
var is_array = IS_ARRAY(array);
@@ -1411,7 +1399,7 @@
function ArrayIndexOf(element, index) {
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.indexOf");
- var length = TO_LENGTH_OR_UINT32(this.length);
+ var length = TO_LENGTH(this.length);
return InnerArrayIndexOf(this, element, index, length);
}
@@ -1469,9 +1457,9 @@
function ArrayLastIndexOf(element, index) {
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.lastIndexOf");
- var length = TO_LENGTH_OR_UINT32(this.length);
+ var length = TO_LENGTH(this.length);
return InnerArrayLastIndexOf(this, element, index, length,
- %_ArgumentsLength());
+ arguments.length);
}
@@ -1508,9 +1496,9 @@
// Pull out the length so that modifications to the length in the
// loop will not affect the looping and side effects are visible.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArrayReduce(callback, current, array, length,
- %_ArgumentsLength());
+ arguments.length);
}
@@ -1548,9 +1536,9 @@
// Pull out the length so that side effects are visible before the
// callback function is checked.
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArrayReduceRight(callback, current, array, length,
- %_ArgumentsLength());
+ arguments.length);
}
@@ -1701,7 +1689,7 @@
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.fill");
var array = TO_OBJECT(this);
- var length = TO_LENGTH_OR_UINT32(array.length);
+ var length = TO_LENGTH(array.length);
return InnerArrayFill(value, start, end, array, length);
}
@@ -1726,7 +1714,7 @@
while (k < length) {
var elementK = array[k];
- if (SameValueZero(searchElement, elementK)) {
+ if (%SameValueZero(searchElement, elementK)) {
return true;
}
@@ -1778,23 +1766,10 @@
if (!IS_UNDEFINED(iterable)) {
result = %IsConstructor(this) ? new this() : [];
-
- var iterator = GetIterator(items, iterable);
-
k = 0;
- while (true) {
- var next = iterator.next();
- if (!IS_RECEIVER(next)) {
- throw MakeTypeError(kIteratorResultNotAnObject, next);
- }
-
- if (next.done) {
- result.length = k;
- return result;
- }
-
- nextValue = next.value;
+ for (nextValue of
+ { [iteratorSymbol]() { return GetIterator(items, iterable) } }) {
if (mapping) {
mappedValue = %_Call(mapfn, receiver, nextValue, k);
} else {
@@ -1803,6 +1778,8 @@
AddArrayElement(this, result, k, mappedValue);
k++;
}
+ result.length = k;
+ return result;
} else {
var len = TO_LENGTH(items.length);
result = %IsConstructor(this) ? new this(len) : new GlobalArray(len);
@@ -1824,13 +1801,13 @@
// ES6, draft 05-22-14, section 22.1.2.3
-function ArrayOf() {
- var length = %_ArgumentsLength();
+function ArrayOf(...args) {
+ var length = args.length;
var constructor = this;
// TODO: Implement IsConstructor (ES6 section 7.2.5)
var array = %IsConstructor(constructor) ? new constructor(length) : [];
for (var i = 0; i < length; i++) {
- AddArrayElement(constructor, array, i, %_Arguments(i));
+ AddArrayElement(constructor, array, i, args[i]);
}
array.length = length;
return array;