Index: src/array.js |
diff --git a/src/array.js b/src/array.js |
index 44deff7de42c60986741615b1be389f9668dbf85..f0a39181d57fb2df5904d0eb6d308ff036365342 100644 |
--- a/src/array.js |
+++ b/src/array.js |
@@ -1127,9 +1127,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(); |
@@ -1140,7 +1139,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; |
} |
} |
@@ -1163,9 +1163,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++) { |
@@ -1173,7 +1172,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); |
} |
} |
} |
@@ -1194,9 +1194,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++) { |
@@ -1204,7 +1203,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; |
@@ -1224,9 +1224,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++) { |
@@ -1234,7 +1233,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; |
@@ -1253,9 +1253,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); |
@@ -1265,7 +1264,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); |