| Index: src/array.js
|
| diff --git a/src/array.js b/src/array.js
|
| index 3d4a066bc5e0c244a3e0187d267e3e67e8515a01..368ef1f0bc5bef6905222e457606a1c81cbbc0ca 100644
|
| --- a/src/array.js
|
| +++ b/src/array.js
|
| @@ -1126,9 +1126,8 @@ function ArrayFilter(f, receiver) {
|
| }
|
| if (IS_NULL_OR_UNDEFINED(receiver)) {
|
| receiver = %GetDefaultReceiver(f) || receiver;
|
| - } else if (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
|
| - receiver = ToObject(receiver);
|
| }
|
| + var needs_wrapper = SHOULD_CREATE_WRAPPER(f, receiver);
|
|
|
| var result = new $Array();
|
| var accumulator = new InternalArray();
|
| @@ -1139,7 +1138,8 @@ function ArrayFilter(f, receiver) {
|
| var element = array[i];
|
| // Prepare break slots for debugger step in.
|
| if (stepping) %DebugPrepareStepInIfStepping(f);
|
| - if (%_CallFunction(receiver, element, i, array, f)) {
|
| + var new_receiver = needs_wrapper ? ToObject(receiver) : receiver;
|
| + if (%_CallFunction(new_receiver, element, i, array, f)) {
|
| accumulator[accumulator_length++] = element;
|
| }
|
| }
|
| @@ -1162,9 +1162,8 @@ function ArrayForEach(f, receiver) {
|
| }
|
| if (IS_NULL_OR_UNDEFINED(receiver)) {
|
| receiver = %GetDefaultReceiver(f) || receiver;
|
| - } else if (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
|
| - receiver = ToObject(receiver);
|
| }
|
| + var needs_wrapper = SHOULD_CREATE_WRAPPER(f, receiver);
|
|
|
| var stepping = DEBUG_IS_ACTIVE && %DebugCallbackSupportsStepping(f);
|
| for (var i = 0; i < length; i++) {
|
| @@ -1172,7 +1171,8 @@ function ArrayForEach(f, receiver) {
|
| var element = array[i];
|
| // Prepare break slots for debugger step in.
|
| if (stepping) %DebugPrepareStepInIfStepping(f);
|
| - %_CallFunction(receiver, element, i, array, f);
|
| + var new_receiver = needs_wrapper ? ToObject(receiver) : receiver;
|
| + %_CallFunction(new_receiver, element, i, array, f);
|
| }
|
| }
|
| }
|
| @@ -1193,9 +1193,8 @@ function ArraySome(f, receiver) {
|
| }
|
| if (IS_NULL_OR_UNDEFINED(receiver)) {
|
| receiver = %GetDefaultReceiver(f) || receiver;
|
| - } else if (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
|
| - receiver = ToObject(receiver);
|
| }
|
| + var needs_wrapper = SHOULD_CREATE_WRAPPER(f, receiver);
|
|
|
| var stepping = DEBUG_IS_ACTIVE && %DebugCallbackSupportsStepping(f);
|
| for (var i = 0; i < length; i++) {
|
| @@ -1203,7 +1202,8 @@ function ArraySome(f, receiver) {
|
| var element = array[i];
|
| // Prepare break slots for debugger step in.
|
| if (stepping) %DebugPrepareStepInIfStepping(f);
|
| - if (%_CallFunction(receiver, element, i, array, f)) return true;
|
| + var new_receiver = needs_wrapper ? ToObject(receiver) : receiver;
|
| + if (%_CallFunction(new_receiver, element, i, array, f)) return true;
|
| }
|
| }
|
| return false;
|
| @@ -1223,9 +1223,8 @@ function ArrayEvery(f, receiver) {
|
| }
|
| if (IS_NULL_OR_UNDEFINED(receiver)) {
|
| receiver = %GetDefaultReceiver(f) || receiver;
|
| - } else if (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
|
| - receiver = ToObject(receiver);
|
| }
|
| + var needs_wrapper = SHOULD_CREATE_WRAPPER(f, receiver);
|
|
|
| var stepping = DEBUG_IS_ACTIVE && %DebugCallbackSupportsStepping(f);
|
| for (var i = 0; i < length; i++) {
|
| @@ -1233,7 +1232,8 @@ function ArrayEvery(f, receiver) {
|
| var element = array[i];
|
| // Prepare break slots for debugger step in.
|
| if (stepping) %DebugPrepareStepInIfStepping(f);
|
| - if (!%_CallFunction(receiver, element, i, array, f)) return false;
|
| + var new_receiver = needs_wrapper ? ToObject(receiver) : receiver;
|
| + if (!%_CallFunction(new_receiver, element, i, array, f)) return false;
|
| }
|
| }
|
| return true;
|
| @@ -1252,9 +1252,8 @@ function ArrayMap(f, receiver) {
|
| }
|
| if (IS_NULL_OR_UNDEFINED(receiver)) {
|
| receiver = %GetDefaultReceiver(f) || receiver;
|
| - } else if (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
|
| - receiver = ToObject(receiver);
|
| }
|
| + var needs_wrapper = SHOULD_CREATE_WRAPPER(f, receiver);
|
|
|
| var result = new $Array();
|
| var accumulator = new InternalArray(length);
|
| @@ -1264,7 +1263,8 @@ function ArrayMap(f, receiver) {
|
| var element = array[i];
|
| // Prepare break slots for debugger step in.
|
| if (stepping) %DebugPrepareStepInIfStepping(f);
|
| - accumulator[i] = %_CallFunction(receiver, element, i, array, f);
|
| + var new_receiver = needs_wrapper ? ToObject(receiver) : receiver;
|
| + accumulator[i] = %_CallFunction(new_receiver, element, i, array, f);
|
| }
|
| }
|
| %MoveArrayContents(accumulator, result);
|
|
|