Revert of [key-accumulator] Starting to reimplement the key-accumulator

src/runtime/runtime-forin.cc

 // Copyright 2015 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/elements.h"
 #include "src/factory.h"
 #include "src/isolate-inl.h"
-#include "src/keys.h"
 #include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
 
 namespace {
 
 // Returns either a FixedArray or, if the given {receiver} has an enum cache
 // that contains all enumerable properties of the {receiver} and its prototypes
 // have none, the map of the {receiver}. This is used to speed up the check for
 // deletions during a for-in.
 MaybeHandle<HeapObject> Enumerate(Handle<JSReceiver> receiver) {
   Isolate* const isolate = receiver->GetIsolate();
-  FastKeyAccumulator accumulator(isolate, receiver, INCLUDE_PROTOS,
-                                 ENUMERABLE_STRINGS);
   // Test if we have an enum cache for {receiver}.
-  if (!accumulator.is_receiver_simple_enum()) {
+  if (!receiver->IsSimpleEnum()) {
     Handle<FixedArray> keys;
-    ASSIGN_RETURN_ON_EXCEPTION(isolate, keys, accumulator.GetKeys(KEEP_NUMBERS),
-                               HeapObject);
+    ASSIGN_RETURN_ON_EXCEPTION(
+        isolate, keys,
+        JSReceiver::GetKeys(receiver, INCLUDE_PROTOS, ENUMERABLE_STRINGS),
+        HeapObject);
     // Test again, since cache may have been built by GetKeys() calls above.
-    if (!accumulator.is_receiver_simple_enum()) return keys;
+    if (!receiver->IsSimpleEnum()) return keys;
   }
   return handle(receiver->map(), isolate);
 }
 
 
 MaybeHandle<Object> Filter(Handle<JSReceiver> receiver, Handle<Object> key) {
   Isolate* const isolate = receiver->GetIsolate();
+  // TODO(turbofan): Fast case for array indices.
   Handle<Name> name;
   ASSIGN_RETURN_ON_EXCEPTION(isolate, name, Object::ToName(isolate, key),
                              Object);
-  // Directly check for elements if the key is a smi and avoid a conversion
-  // roundtrip (Number -> Name -> Number).
-  if (key->IsNumber() && receiver->map()->OnlyHasSimpleProperties()) {
-    Handle<JSObject> object = Handle<JSObject>::cast(receiver);
-    ElementsAccessor* accessor = object->GetElementsAccessor();
-    DCHECK_LT(key->Number(), kMaxUInt32);
-    if (accessor->HasElement(object, key->Number(), ONLY_ENUMERABLE)) {
-      return name;
-    }
-  }
   Maybe<bool> result = JSReceiver::HasProperty(receiver, name);
   MAYBE_RETURN_NULL(result);
   if (result.FromJust()) return name;
   return isolate->factory()->undefined_value();
 }
 
 }  // namespace
 
 
 RUNTIME_FUNCTION(Runtime_ForInEnumerate) {
@@ skipping 80 matching lines @@
   SealHandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_SMI_ARG_CHECKED(index, 0);
   DCHECK_LE(0, index);
   DCHECK_LT(index, Smi::kMaxValue);
   return Smi::FromInt(index + 1);
 }
 
 }  // namespace internal
 }  // namespace v8