Reintroduced dictionary that can use objects as keys.

src/objects.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1620 matching lines @@
   // Has/Get/SetHiddenPropertiesObject methods don't allow the holder to be
   // a JSGlobalProxy. Use BypassGlobalProxy method above to get to the real
   // holder.
   //
   // These accessors do not touch interceptors or accessors.
   inline bool HasHiddenPropertiesObject();
   inline Object* GetHiddenPropertiesObject();
   MUST_USE_RESULT inline MaybeObject* SetHiddenPropertiesObject(
       Object* hidden_obj);
 
+  MUST_USE_RESULT MaybeObject* GetHiddenProperties(bool create_if_needed);

[Vitaly Repeshko, 2011/07/26 13:53:14]

Document what is returned when there are no existing hidden properties and
create_if_needed is false.

[Michael Starzinger, 2011/07/26 22:30:23]

Fixed.

+
+  // Retrieves a permanent object identity hash code.
+  MUST_USE_RESULT MaybeObject* GetIdentityHash();
+
   MUST_USE_RESULT MaybeObject* DeleteProperty(String* name, DeleteMode mode);
   MUST_USE_RESULT MaybeObject* DeleteElement(uint32_t index, DeleteMode mode);
 
   // Tests for the fast common case for property enumeration.
   bool IsSimpleEnum();
 
   // Do we want to keep the elements in fast case when increasing the
   // capacity?
   bool ShouldConvertToSlowElements(int new_capacity);
   // Returns true if the backing storage for the slow-case elements of
@@ skipping 1255 matching lines @@
   // Remove all entries were key is a number and (from <= key && key < to).
   void RemoveNumberEntries(uint32_t from, uint32_t to);
 
   // Bit masks.
   static const int kRequiresSlowElementsMask = 1;
   static const int kRequiresSlowElementsTagSize = 1;
   static const uint32_t kRequiresSlowElementsLimit = (1 << 29) - 1;
 };
 
 
+class ObjectDictionaryShape {
+ public:
+  static inline bool IsMatch(JSObject* key, Object* other);
+  static inline uint32_t Hash(JSObject* key);
+  static inline uint32_t HashForObject(JSObject* key, Object* object);
+  MUST_USE_RESULT static inline MaybeObject* AsObject(JSObject* key);
+  static const int kPrefixSize = 2;
+  static const int kEntrySize = 3;
+  static const bool kIsEnumerable = false;
+};
+
+
+class ObjectDictionary: public Dictionary<ObjectDictionaryShape, JSObject*> {

[Vitaly Repeshko, 2011/07/26 13:53:14]

Needs a comment.

[Michael Starzinger, 2011/07/26 22:30:23]

Fixed.

+ public:
+  static inline ObjectDictionary* cast(Object* obj) {
+    ASSERT(obj->IsDictionary());
+    return reinterpret_cast<ObjectDictionary*>(obj);
+  }
+
+  // Specialized version which checks whether objects have an identity hash.
+  int FindEntry(JSObject* key);
+  int FindEntry(Isolate* isolate, JSObject* key);

[Vitaly Repeshko, 2011/07/26 13:53:14]

Doesn't seem to be defined/called. Remove?

[Vitaly Repeshko, 2011/07/27 15:42:26]

Did you miss this one?

[Michael Starzinger, 2011/07/28 01:23:18]

Fixed. Yep, missed that one.

+
+  // Specialized version which makes sure objects have an identity hash.
+  MUST_USE_RESULT MaybeObject* Add(JSObject* key, Object* value);
+  MUST_USE_RESULT MaybeObject* Add(JSObject* key,

[Vitaly Repeshko, 2011/07/26 13:53:14]

Same here.

Are PropertyDetails really required? If not, change the entry size in the shape
to 2.

[Michael Starzinger, 2011/07/26 22:30:23]

In that case the ObjectDictionary should use HashTable instead of Dictionary as
a base class, because those PropertyDetails are the only difference (besides
being enumerable) between them. Right?

[Vitaly Repeshko, 2011/07/27 15:42:26]

Yes, Dictionaries are used for storing properties and elements. Change the base
class. Maybe the name should also be changed to ObjectHashTable.

[Michael Starzinger, 2011/07/28 01:23:18]

Fixed. Required a lot of other changes, but it becomes much cleaner now I think.
:)

+                                   Object* value,
+                                   PropertyDetails details);
+};
+
+
 // JSFunctionResultCache caches results of some JSFunction invocation.
 // It is a fixed array with fixed structure:
 //   [0]: factory function
 //   [1]: finger index
 //   [2]: current cache size
 //   [3]: dummy field.
 // The rest of array are key/value pairs.
 class JSFunctionResultCache: public FixedArray {
  public:
   static const int kFactoryIndex = 0;
@@ skipping 4257 matching lines @@
     } else {
       value &= ~(1 << bit_position);
     }
     return value;
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_H_