[runtime] Support Symbols in KeyAccumulator

src/objects.h

 // Copyright 2012 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 2249 matching lines @@
   inline void SetInternalField(int index, Object* value);
   inline void SetInternalField(int index, Smi* value);
 
   // Returns the number of properties on this object filtering out properties
   // with the specified attributes (ignoring interceptors).
   int NumberOfOwnProperties(PropertyAttributes filter = NONE);
   // Fill in details for properties into storage starting at the specified
   // index. Returns the number of properties added.
   int GetOwnPropertyNames(FixedArray* storage, int index,
                           PropertyAttributes filter = NONE);
+  int CollectOwnPropertyNames(KeyAccumulator* keys,
+                              PropertyAttributes filter = NONE);
 
   // Returns the number of properties on this object filtering out properties
   // with the specified attributes (ignoring interceptors).
   int NumberOfOwnElements(PropertyAttributes filter);
   // Returns the number of enumerable elements (ignoring interceptors).
   int NumberOfEnumElements();
   // Returns the number of elements on this object filtering out elements
   // with the specified attributes (ignoring interceptors).
   int GetOwnElementKeys(FixedArray* storage, PropertyAttributes filter);
   static void CollectOwnElementKeys(Handle<JSObject> object,
@@ skipping 1129 matching lines @@
   // Returns true if the dictionary contains any elements that are non-writable,
   // non-configurable, non-enumerable, or have getters/setters.
   bool HasComplexElements();
 
   enum SortMode { UNSORTED, SORTED };
 
   // Fill in details for properties into storage.
   // Returns the number of properties added.
   int CopyKeysTo(FixedArray* storage, int index, PropertyAttributes filter,
                  SortMode sort_mode);
+  // Collect the unsorted keys into the given KeyAccumulator.
+  int CollectKeysTo(KeyAccumulator* keys, PropertyAttributes filter);
 
   // Copies enumerable keys to preallocated fixed array.
   void CopyEnumKeysTo(FixedArray* storage);
 
   // Accessors for next enumeration index.
   void SetNextEnumerationIndex(int index) {
     DCHECK(index != 0);
     this->set(kNextEnumerationIndexIndex, Smi::FromInt(index));
   }
 
@@ skipping 7317 matching lines @@
 enum AddKeyConversion { DO_NOT_CONVERT, CONVERT_TO_ARRAY_INDEX, PROXY_MAGIC };
 
 // This is a helper class for JSReceiver::GetKeys which collects and sorts keys.
 // GetKeys needs to sort keys per prototype level, first showing the integer
 // indices from elements then the strings from the properties. However, this
 // does not apply to proxies which are in full control of how the keys are
 // sorted.
 //
 // For performance reasons the KeyAccumulator internally separates integer
 // keys in |elements_| into sorted lists per prototype level. String keys are
 // collected in |properties_|, a single OrderedHashSet. To separate the keys per

[Jakob Kummerow, 2015/11/03 15:33:37]

nit: outdated comment

 // level later when assembling the final list, |levelLengths_| keeps track of
 // the total number of keys (integers + strings) per level.
 //
 // Only unique keys are kept by the KeyAccumulator, strings are stored in a
 // HashSet for inexpensive lookups. Integer keys are kept in sorted lists which
 // are more compact and allow for reasonably fast includes check.
 class KeyAccumulator final BASE_EMBEDDED {
  public:
   explicit KeyAccumulator(Isolate* isolate,
                           KeyFilter filter = KeyFilter::SKIP_SYMBOLS)
       : isolate_(isolate), filter_(filter) {}
   ~KeyAccumulator();
 
   bool AddKey(uint32_t key);

[Jakob Kummerow, 2015/11/03 15:39:59]

nit: most of these methods can probably be private, right?

   bool AddKey(Object* key, AddKeyConversion convert = DO_NOT_CONVERT);
   bool AddKey(Handle<Object> key, AddKeyConversion convert = DO_NOT_CONVERT);
+  bool AddStringKey(Handle<Object> key, AddKeyConversion convert);
+  bool AddSymbolKey(Handle<Object> array);
   void AddKeys(Handle<FixedArray> array,
                AddKeyConversion convert = DO_NOT_CONVERT);
   void AddKeys(Handle<JSObject> array,
                AddKeyConversion convert = DO_NOT_CONVERT);
   void AddKeysFromProxy(Handle<JSObject> array);
   void AddElementKeysFromInterceptor(Handle<JSObject> array);
   // Jump to the next level, pushing the current |levelLength_| to

[Jakob Kummerow, 2015/11/03 15:33:37]

nit: s/levelLength_/level_lengths_/.

I count six more variable names in comments below that need similar updates.

   // |levelLengths_| and adding a new list to |elements_|.
   void NextPrototype();
   // Sort the integer indices in the last list in |elements_|
   void SortCurrentElementsList();
   void SortCurrentElementsListRemoveDuplicates();
   Handle<FixedArray> GetKeys(GetKeysConversion convert = KEEP_NUMBERS);
+  int GetLength();
 

[Jakob Kummerow, 2015/11/03 15:33:37]

nit: one empty line is enough

 
  private:
   Isolate* isolate_;
   KeyFilter filter_;
   // |elements_| contains the sorted element keys (indices) per level.
   std::vector<std::vector<uint32_t>*> elements_;
   // |protoLengths_| contains the total number of keys (elements + properties)
   // per level. Negative values mark counts for a level with keys from a proxy.
-  std::vector<int> levelLengths_;
+  std::vector<int> level_lengths_;
   // |properties_| contains the property keys per level in insertion order.
-  Handle<OrderedHashSet> properties_;
+  Handle<OrderedHashSet> string_properties_;
+  // |properties_| contains the symbol property keys per level in
+  // insertion order.
+  Handle<OrderedHashSet> symbol_properties_;
   // |length_| keeps track of the total number of all element and property keys.
   int length_ = 0;
   // |levelLength_| keeps track of the total number of keys
   // (elements + properties) in the current level.
-  int levelLength_ = 0;
+  int level_string_length_ = 0;
+  // |levelSymbolLength_| keeps track of the total number of symbol keys
+  // (elements + properties) in the current level.
+  int level_symbol_length_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(KeyAccumulator);
 };
 
 }  // NOLINT, false-positive due to second-order macros.
 }  // NOLINT, false-positive due to second-order macros.
 
 #endif  // V8_OBJECTS_H_