diff options
| author | Ben Murdoch <benm@google.com> | 2011-12-02 17:19:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:49 +0000 |
| commit | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (patch) | |
| tree | 5cb33db083ae7ebe431e2a460fb3806c54531f9c /src/array.js | |
| parent | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (diff) | |
| download | android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.gz android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.bz2 android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.zip | |
Upgrade to V8 3.4
Merge 3.4.14.35
Simple merge required updates to makefiles only.
Bug: 568872
Change-Id: I403a38452c547e06fcfa951c12eca12a1bc40978
Diffstat (limited to 'src/array.js')
| -rw-r--r-- | src/array.js | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/array.js b/src/array.js index df080a76..e6c13d95 100644 --- a/src/array.js +++ b/src/array.js @@ -631,7 +631,9 @@ function ArraySlice(start, end) { if (end_i < start_i) return result; - if (IS_ARRAY(this)) { + if (IS_ARRAY(this) && + (end_i > 1000) && + (%EstimateNumberOfElements(this) < end_i)) { SmartSlice(this, start_i, end_i - start_i, len, result); } else { SimpleSlice(this, start_i, end_i - start_i, len, result); @@ -740,14 +742,15 @@ function ArraySort(comparefn) { else return x < y ? -1 : 1; }; } - var global_receiver = %GetGlobalReceiver(); + var receiver = + %_IsNativeOrStrictMode(comparefn) ? void 0 : %GetGlobalReceiver(); function InsertionSort(a, from, to) { for (var i = from + 1; i < to; i++) { var element = a[i]; for (var j = i - 1; j >= from; j--) { var tmp = a[j]; - var order = %_CallFunction(global_receiver, tmp, element, comparefn); + var order = %_CallFunction(receiver, tmp, element, comparefn); if (order > 0) { a[j + 1] = tmp; } else { @@ -769,14 +772,14 @@ function ArraySort(comparefn) { var v1 = a[to - 1]; var middle_index = from + ((to - from) >> 1); var v2 = a[middle_index]; - var c01 = %_CallFunction(global_receiver, v0, v1, comparefn); + var c01 = %_CallFunction(receiver, v0, v1, comparefn); if (c01 > 0) { // v1 < v0, so swap them. var tmp = v0; v0 = v1; v1 = tmp; } // v0 <= v1. - var c02 = %_CallFunction(global_receiver, v0, v2, comparefn); + var c02 = %_CallFunction(receiver, v0, v2, comparefn); if (c02 >= 0) { // v2 <= v0 <= v1. var tmp = v0; @@ -785,7 +788,7 @@ function ArraySort(comparefn) { v1 = tmp; } else { // v0 <= v1 && v0 < v2 - var c12 = %_CallFunction(global_receiver, v1, v2, comparefn); + var c12 = %_CallFunction(receiver, v1, v2, comparefn); if (c12 > 0) { // v0 <= v2 < v1 var tmp = v1; @@ -806,7 +809,7 @@ function ArraySort(comparefn) { // From i to high_start are elements that haven't been compared yet. partition: for (var i = low_end + 1; i < high_start; i++) { var element = a[i]; - var order = %_CallFunction(global_receiver, element, pivot, comparefn); + var order = %_CallFunction(receiver, element, pivot, comparefn); if (order < 0) { %_SwapElements(a, i, low_end); low_end++; @@ -815,7 +818,7 @@ function ArraySort(comparefn) { high_start--; if (high_start == i) break partition; var top_elem = a[high_start]; - order = %_CallFunction(global_receiver, top_elem, pivot, comparefn); + order = %_CallFunction(receiver, top_elem, pivot, comparefn); } while (order > 0); %_SwapElements(a, i, high_start); if (order < 0) { @@ -996,7 +999,7 @@ function ArrayFilter(f, receiver) { } // Pull out the length so that modifications to the length in the // loop will not affect the looping. - var length = this.length; + var length = ToUint32(this.length); var result = []; var result_length = 0; for (var i = 0; i < length; i++) { @@ -1233,7 +1236,7 @@ function ArrayReduce(callback, current) { } // Pull out the length so that modifications to the length in the // loop will not affect the looping. - var length = this.length; + var length = ToUint32(this.length); var i = 0; find_initial: if (%_ArgumentsLength() < 2) { @@ -1250,7 +1253,7 @@ function ArrayReduce(callback, current) { for (; i < length; i++) { var element = this[i]; if (!IS_UNDEFINED(element) || i in this) { - current = callback.call(null, current, element, i, this); + current = callback.call(void 0, current, element, i, this); } } return current; @@ -1265,7 +1268,7 @@ function ArrayReduceRight(callback, current) { if (!IS_FUNCTION(callback)) { throw MakeTypeError('called_non_callable', [callback]); } - var i = this.length - 1; + var i = ToUint32(this.length) - 1; find_initial: if (%_ArgumentsLength() < 2) { for (; i >= 0; i--) { @@ -1281,7 +1284,7 @@ function ArrayReduceRight(callback, current) { for (; i >= 0; i--) { var element = this[i]; if (!IS_UNDEFINED(element) || i in this) { - current = callback.call(null, current, element, i, this); + current = callback.call(void 0, current, element, i, this); } } return current; |
