[keys] Simplify KeyAccumulator

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 182 matching lines @@
   }
 
   if (!array->elements()->IsDictionary()) {
     RUNTIME_ASSERT(array->HasFastSmiOrObjectElements() ||
                    array->HasFastDoubleElements());
     uint32_t actual_length = static_cast<uint32_t>(array->elements()->length());
     return *isolate->factory()->NewNumberFromUint(Min(actual_length, length));
   }
 
   KeyAccumulator accumulator(isolate, OWN_ONLY, ALL_PROPERTIES);
   // No need to separate prototype levels since we only get element keys.

[Jakob Kummerow, 2016/05/23 16:25:22]

outdated comment?

   for (PrototypeIterator iter(isolate, array,
                               PrototypeIterator::START_AT_RECEIVER);
        !iter.IsAtEnd(); iter.Advance()) {
     if (PrototypeIterator::GetCurrent(iter)->IsJSProxy() ||
         PrototypeIterator::GetCurrent<JSObject>(iter)
             ->HasIndexedInterceptor()) {
       // Bail out if we find a proxy or interceptor, likely not worth
       // collecting keys in that case.
       return *isolate->factory()->NewNumberFromUint(length);
     }
-    accumulator.NextPrototype();
     Handle<JSObject> current = PrototypeIterator::GetCurrent<JSObject>(iter);
-    accumulator.CollectOwnElementIndices(current);
+    accumulator.CollectOwnElementIndices(array, current);
   }
   // Erase any keys >= length.
   Handle<FixedArray> keys = accumulator.GetKeys(KEEP_NUMBERS);
   int j = 0;
   for (int i = 0; i < keys->length(); i++) {
     if (NumberToUint32(keys->get(i)) >= length) continue;
     if (i != j) keys->set(j, keys->get(i));
     j++;
   }
 
@@ skipping 266 matching lines @@
   CONVERT_ARG_HANDLE_CHECKED(Object, original_array, 0);
   Handle<Object> constructor;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
       isolate, constructor,
       Object::ArraySpeciesConstructor(isolate, original_array));
   return *constructor;
 }
 
 }  // namespace internal
 }  // namespace v8