Revert of [runtime] Do not use the enum-cache for non-prototype objects.

src/objects.h

 // 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.
 
 #ifndef V8_OBJECTS_H_
 #define V8_OBJECTS_H_
 
 #include <iosfwd>
 
 #include "src/allocation.h"
@@ skipping 2266 matching lines @@
   static inline int GetHeaderSize(InstanceType instance_type);
   inline int GetHeaderSize();
 
   static inline int GetInternalFieldCount(Map* map);
   inline int GetInternalFieldCount();
   inline int GetInternalFieldOffset(int index);
   inline Object* GetInternalField(int index);
   inline void SetInternalField(int index, Object* value);
   inline void SetInternalField(int index, Smi* value);
 
+  void CollectOwnPropertyNames(KeyAccumulator* keys,
+                               PropertyFilter filter = ALL_PROPERTIES);
+
   // Returns the number of properties on this object filtering out properties
   // with the specified attributes (ignoring interceptors).
   // TODO(jkummerow): Deprecated, only used by Object.observe.
   int NumberOfOwnElements(PropertyFilter filter);
   // Returns the number of elements on this object filtering out elements
   // with the specified attributes (ignoring interceptors).
   // TODO(jkummerow): Deprecated, only used by Object.observe.
   int GetOwnElementKeys(FixedArray* storage, PropertyFilter filter);
 
-  void CollectOwnPropertyKeys(
-      KeyAccumulator* keys, PropertyFilter filter = ALL_PROPERTIES,
-      JSReceiver::KeyCollectionType type = JSReceiver::OWN_ONLY);
-
   static void CollectOwnElementKeys(Handle<JSObject> object,
                                     KeyAccumulator* keys,
                                     PropertyFilter filter);
-  static Handle<FixedArray> GetOwnEnumPropertyKeys(Handle<JSObject> object,
-                                                   bool cache_result);
+
+  static Handle<FixedArray> GetEnumPropertyKeys(Handle<JSObject> object,
+                                                bool cache_result);
 
   // Returns a new map with all transitions dropped from the object's current
   // map and the ElementsKind set.
   static Handle<Map> GetElementsTransitionMap(Handle<JSObject> object,
                                               ElementsKind to_kind);
   static void TransitionElementsKind(Handle<JSObject> object,
                                      ElementsKind to_kind);
 
   // Always use this to migrate an object to a new map.
   // |expected_additional_properties| is only used for fast-to-slow transitions
@@ skipping 233 matching lines @@
   // Helper for fast versions of preventExtensions, seal, and freeze.
   // attrs is one of NONE, SEALED, or FROZEN (depending on the operation).
   template <PropertyAttributes attrs>
   MUST_USE_RESULT static Maybe<bool> PreventExtensionsWithTransition(
       Handle<JSObject> object, ShouldThrow should_throw);
 
   MUST_USE_RESULT static Maybe<bool> SetPrototypeUnobserved(
       Handle<JSObject> object, Handle<Object> value, bool from_javascript,
       ShouldThrow should_throw);
 
-  void CollectFastPropertyKeysTo(KeyAccumulator* keys, PropertyFilter filter,
-                                 JSReceiver::KeyCollectionType type);
-
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSObject);
 };
 
 
 // Common superclass for FixedArrays that allow implementations to share
 // common accessors and some code paths.
 class FixedArrayBase: public HeapObject {
  public:
   // [length]: length of the array.
   inline int length() const;
@@ skipping 8162 matching lines @@
     }
     return value;
   }
 };
 
 
 }  // NOLINT, false-positive due to second-order macros.
 }  // NOLINT, false-positive due to second-order macros.
 
 #endif  // V8_OBJECTS_H_