[builtins] WIP: Array indexOf in TurboFan/Runtime

src/runtime/runtime-array.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/runtime/runtime-utils.h"
 
 #include "src/arguments.h"
 #include "src/code-stubs.h"
 #include "src/conversions-inl.h"
 #include "src/elements.h"
@@ skipping 52 matching lines @@
     InstallBuiltin(isolate, holder, "push", Builtins::kArrayPush);
   } else {
     FastArrayPushStub stub(isolate);
     InstallCode(isolate, holder, "push", stub.GetCode());
   }
   InstallBuiltin(isolate, holder, "shift", Builtins::kArrayShift);
   InstallBuiltin(isolate, holder, "unshift", Builtins::kArrayUnshift);
   InstallBuiltin(isolate, holder, "slice", Builtins::kArraySlice);
   InstallBuiltin(isolate, holder, "splice", Builtins::kArraySplice);
   InstallBuiltin(isolate, holder, "includes", Builtins::kArrayIncludes, 2);
+  InstallBuiltin(isolate, holder, "indexOf", Builtins::kArrayIndexOf, 2);
 
   return *holder;
 }
 
 
 RUNTIME_FUNCTION(Runtime_FixedArrayGet) {
   SealHandleScope shs(isolate);
   DCHECK(args.length() == 2);
   CONVERT_ARG_CHECKED(FixedArray, object, 0);
   CONVERT_SMI_ARG_CHECKED(index, 1);
@@ skipping 284 matching lines @@
   CONVERT_NUMBER_CHECKED(int, key, Int32, args[1]);
 
   if (key < 0) {
     return object->elements();
   }
 
   uint32_t capacity = static_cast<uint32_t>(object->elements()->length());
   uint32_t index = static_cast<uint32_t>(key);
 
   if (index >= capacity) {
-    if (object->map()->is_prototype_map() ||
-        object->WouldConvertToSlowElements(index)) {
+    if (object->WouldConvertToSlowElements(index)) {

[Benedikt Meurer, 2016/08/11 04:02:24]

You seem to undo a correctness fix here.

[mattloring, 2016/08/15 17:31:09]

Done.

       // We don't want to allow operations that cause lazy deopt. Return a Smi
       // as a signal that optimized code should eagerly deoptimize.
       return Smi::FromInt(0);
     }
 
     uint32_t new_capacity = JSObject::NewElementsCapacity(index + 1);
     object->GetElementsAccessor()->GrowCapacityAndConvert(object, new_capacity);
   }
 
   // On success, return the fixed array elements.
@@ skipping 148 matching lines @@
     }
 
     // If SameValueZero(searchElement, elementK) is true, return true.
     if (search_element->SameValueZero(*element_k)) {
       return isolate->heap()->true_value();
     }
   }
   return isolate->heap()->false_value();
 }
 
+RUNTIME_FUNCTION(Runtime_ArrayIndexOf) {
+  HandleScope shs(isolate);
+  DCHECK(args.length() == 3);
+  CONVERT_ARG_HANDLE_CHECKED(Object, search_element, 1);
+  CONVERT_ARG_HANDLE_CHECKED(Object, from_index, 2);
+
+  // Let O be ? ToObject(this value).
+  Handle<JSReceiver> object;
+  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+      isolate, object, Object::ToObject(isolate, handle(args[0], isolate)));

[Camillo Bruni, 2016/08/12 10:46:49]

nit: use args.at<Object>(0)

[mattloring, 2016/08/15 17:31:09]

Done.

+
+  // Let len be ? ToLength(? Get(O, "length")).
+  int64_t len;
+  {
+    if (object->map()->instance_type() == JS_ARRAY_TYPE) {

[Camillo Bruni, 2016/08/12 10:46:49]

nit: object->IsJSArray()

[mattloring, 2016/08/15 17:31:09]

Done.

+      uint32_t len32 = 0;
+      bool success = JSArray::cast(*object)->length()->ToArrayLength(&len32);
+      DCHECK(success);
+      USE(success);
+      len = len32;
+    } else {
+      Handle<Object> len_;
+      ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+          isolate, len_,
+          Object::GetProperty(object, isolate->factory()->length_string()));
+
+      ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, len_,
+                                         Object::ToLength(isolate, len_));
+      len = static_cast<int64_t>(len_->Number());
+      DCHECK_EQ(len, len_->Number());
+    }
+  }
+
+  if (len == 0) return *isolate->factory()->NewNumberFromInt64(-1);

[Camillo Bruni, 2016/08/12 10:46:49]

nit: return Smi::FromInt(-1);

[mattloring, 2016/08/15 17:31:09]

Done.

+
+  // Let n be ? ToInteger(fromIndex). (If fromIndex is undefined, this step
+  // produces the value 0.)
+  int64_t start_from;
+  {
+    ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, from_index,
+                                       Object::ToInteger(isolate, from_index));
+    double fp = from_index->Number();
+    if (fp > len) return *isolate->factory()->NewNumberFromInt64(-1);

[Camillo Bruni, 2016/08/12 10:46:49]

nit: return Smi::FromInt(-1);

[mattloring, 2016/08/15 17:31:09]

Done.

+    start_from = static_cast<int64_t>(fp);
+  }
+
+  int64_t index;
+  if (start_from >= 0) {
+    index = start_from;
+  } else {
+    index = len + start_from;
+    if (index < 0) {
+      index = 0;
+    }
+  }
+
+  // TODO(mattloring): specialize for reciever types as with include.

[Camillo Bruni, 2016/08/12 10:46:49]

Pretty please ;)

[mattloring, 2016/08/17 23:27:20]

Added in the most recent patch set.

+
+  // Otherwise, perform slow lookups for special receiver types
+  for (; index < len; ++index) {
+    // Let elementK be the result of ? Get(O, ! ToString(k)).
+    Handle<Object> element_k;
+    {
+      Handle<Object> index_obj = isolate->factory()->NewNumberFromInt64(index);
+      bool success;
+      LookupIterator it = LookupIterator::PropertyOrElement(
+          isolate, object, index_obj, &success);
+      DCHECK(success);
+      if (!JSReceiver::HasProperty(&it).FromJust()) {
+        continue;
+      }
+      ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, element_k,
+                                         Object::GetProperty(&it));
+      if (search_element->StrictEquals(*element_k)) {
+        return *index_obj;
+      }
+    }
+  }
+  return *isolate->factory()->NewNumberFromInt64(-1);

[Camillo Bruni, 2016/08/12 10:46:49]

nit: return Smi::FromInt(-1);

[mattloring, 2016/08/15 17:31:09]

Done.

+}
+
 }  // namespace internal
 }  // namespace v8