Array.prototype.{every, filter, find, findIndex, forEach, map, some}: Use fresh primitive wrapper f…

src/array.js

Index: src/array.js
diff --git a/src/array.js b/src/array.js
index cf99aceb699de5c1de52f66510f7b07f6048ba7b..2cffac0bac207af96459b76964b1607824f28cd5 100644
--- a/src/array.js
+++ b/src/array.js
@@ -1126,8 +1126,6 @@ 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 result = new $Array();
@@ -1137,9 +1135,14 @@ function ArrayFilter(f, receiver) {
   for (var i = 0; i < length; i++) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&

[arv (Not doing code reviews), 2014/09/12 16:29:17]

Can this test be moved out of the loop?

[Diego Pino, 2014/09/16 10:45:46]

In strict mode, GetDefaultReceiver can return 'undefined'. ToObject throws an
exception if the argument is undefined, so I need to avoid that case.

[wingo, 2014/09/16 12:04:04]

I think Erik was referring to the test, not the body of the test.

e.g.

var needs_wrapper = ...;

for () {
  var new_receiver = needs_wrapper ? ToObject(receiver) : receiver;
  ...
}

+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(f);
-      if (%_CallFunction(receiver, element, i, array, f)) {
+      if (%_CallFunction(new_receiver, element, i, array, f)) {
         accumulator[accumulator_length++] = element;
       }
     }
@@ -1162,17 +1165,20 @@ 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 stepping = DEBUG_IS_ACTIVE && %DebugCallbackSupportsStepping(f);
   for (var i = 0; i < length; i++) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&

[arv (Not doing code reviews), 2014/09/12 16:29:17]

Maybe we can introduce a helper function/macro for this?

SHOULD_CREATE_WRAPPER(receiver, f)

[Diego Pino, 2014/09/16 10:45:46]

Acknowledged.

+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(f);
-      %_CallFunction(receiver, element, i, array, f);
+      %_CallFunction(new_receiver, element, i, array, f);
     }
   }
 }
@@ -1193,17 +1199,20 @@ 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 stepping = DEBUG_IS_ACTIVE && %DebugCallbackSupportsStepping(f);
   for (var i = 0; i < length; i++) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&
+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(f);
-      if (%_CallFunction(receiver, element, i, array, f)) return true;
+      if (%_CallFunction(new_receiver, element, i, array, f)) return true;
     }
   }
   return false;
@@ -1223,17 +1232,20 @@ 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 stepping = DEBUG_IS_ACTIVE && %DebugCallbackSupportsStepping(f);
   for (var i = 0; i < length; i++) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&
+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(f);
-      if (!%_CallFunction(receiver, element, i, array, f)) return false;
+      if (!%_CallFunction(new_receiver, element, i, array, f)) return false;
     }
   }
   return true;
@@ -1252,8 +1264,6 @@ 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 result = new $Array();
@@ -1262,9 +1272,14 @@ function ArrayMap(f, receiver) {
   for (var i = 0; i < length; i++) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&
+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(f);
-      accumulator[i] = %_CallFunction(receiver, element, i, array, f);
+      accumulator[i] = %_CallFunction(new_receiver, element, i, array, f);
     }
   }
   %MoveArrayContents(accumulator, result);
@@ -1411,9 +1426,14 @@ function ArrayReduce(callback, current) {
   for (; i < length; i++) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&
+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(callback);
-      current = %_CallFunction(receiver, current, element, i, array, callback);
+      current = %_CallFunction(new_receiver, current, element, i, array, callback);
     }
   }
   return current;
@@ -1448,9 +1468,14 @@ function ArrayReduceRight(callback, current) {
   for (; i >= 0; i--) {
     if (i in array) {
       var element = array[i];
+      var new_receiver = receiver;
+      if (!IS_NULL_OR_UNDEFINED(receiver) &&
+          !IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(f)) {
+        new_receiver = ToObject(receiver);
+      }
       // Prepare break slots for debugger step in.
       if (stepping) %DebugPrepareStepInIfStepping(callback);
-      current = %_CallFunction(receiver, current, element, i, array, callback);
+      current = %_CallFunction(new_receiver, current, element, i, array, callback);
     }
   }
   return current;