Changeset 36285 in webkit for trunk/JavaScriptCore/kjs/JSObject.h

Timestamp:

Sep 8, 2008, 11:55:39 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-09-08 Sam Weinig <​[email protected]>

Reviewed by Maciej Stachowiak and Oliver Hunt.

Split storage of properties out of the PropertyMap and into the JSObject
to allow sharing PropertyMap on the StructureID. In order to get this
function correctly, the StructureID's transition mappings were changed to
transition based on property name and attribute pairs, instead of just
property name.

• Removes the single property optimization now that the PropertyMap is shared. This will be replaced by in-lining some values on the JSObject.

This is a wash on Sunspider and a 6.7% win on the v8 test suite.

• JavaScriptCore.base.exp:
• VM/CTI.cpp: (JSC::CTI::privateCompileGetByIdSelf): Get the storage directly off the JSObject. (JSC::CTI::privateCompileGetByIdProto): Ditto. (JSC::CTI::privateCompileGetByIdChain): Ditto. (JSC::CTI::privateCompilePutByIdReplace): Ditto.
• kjs/JSObject.cpp: (JSC::JSObject::mark): Mark the PropertyStorage. (JSC::JSObject::put): Update to get the propertyMap of the StructureID. (JSC::JSObject::deleteProperty): Ditto. (JSC::JSObject::defineGetter): Return early if the property is already a getter/setter. (JSC::JSObject::defineSetter): Ditto. (JSC::JSObject::getPropertyAttributes): Update to get the propertyMap of the StructureID (JSC::JSObject::getPropertyNames): Ditto. (JSC::JSObject::removeDirect): Ditto.
• kjs/JSObject.h: Remove PropertyMap and add PropertyStorage. (JSC::JSObject::propertyStorage): return the PropertyStorage. (JSC::JSObject::getDirect): Update to get the propertyMap of the StructureID. (JSC::JSObject::getDirectLocation): Ditto. (JSC::JSObject::offsetForLocation): Compute location directly. (JSC::JSObject::hasCustomProperties): Update to get the propertyMap of the StructureID. (JSC::JSObject::hasGetterSetterProperties): Ditto. (JSC::JSObject::getDirectOffset): Get by indexing into PropertyStorage. (JSC::JSObject::putDirectOffset): Put by indexing into PropertyStorage. (JSC::JSObject::getOwnPropertySlotForWrite): Update to get the propertyMap of the StructureID. (JSC::JSObject::getOwnPropertySlot): Ditto. (JSC::JSObject::putDirect): Move putting into the StructureID unless the property already exists.
• kjs/PropertyMap.cpp: Use the propertyStorage as the storage for the JSValues. (JSC::PropertyMap::checkConsistency): (JSC::PropertyMap::operator=): (JSC::PropertyMap::~PropertyMap): (JSC::PropertyMap::get): (JSC::PropertyMap::getLocation): (JSC::PropertyMap::put): (JSC::PropertyMap::getOffset): (JSC::PropertyMap::insert): (JSC::PropertyMap::expand): (JSC::PropertyMap::rehash): (JSC::PropertyMap::createTable): (JSC::PropertyMap::resizePropertyStorage): Resize the storage to match the size of the map (JSC::PropertyMap::remove): (JSC::PropertyMap::getEnumerablePropertyNames):
• kjs/PropertyMap.h: (JSC::PropertyMapEntry::PropertyMapEntry): (JSC::PropertyMap::isEmpty): (JSC::PropertyMap::size): (JSC::PropertyMap::makingCount): (JSC::PropertyMap::PropertyMap):

• kjs/StructureID.cpp: (JSC::StructureID::addPropertyTransition): Transitions now are based off the property name and attributes. (JSC::StructureID::toDictionaryTransition): Copy the map. (JSC::StructureID::changePrototypeTransition): Copy the map. (JSC::StructureID::getterSetterTransition): Copy the map. (JSC::StructureID::~StructureID):
• kjs/StructureID.h: (JSC::TransitionTableHash::hash): Custom hash for transition map. (JSC::TransitionTableHash::equal): Ditto. (JSC::TransitionTableHashTraits::emptyValue): Custom traits for transition map (JSC::TransitionTableHashTraits::constructDeletedValue): Ditto. (JSC::TransitionTableHashTraits::isDeletedValue): Ditto. (JSC::StructureID::propertyMap): Added.

JavaScriptGlue:

2008-09-08 Sam Weinig <​[email protected]>

Reviewed by Maciej Stachowiak and Oliver Hunt.

Add forwarding headers.

• ForwardingHeaders/wtf/HashFunctions.h: Added.
• ForwardingHeaders/wtf/HashTraits.h: Added.

WebCore:

2008-09-08 Sam Weinig <​[email protected]>

Reviewed by Maciej Stachowiak and Oliver Hunt.

Add forwarding headers.

• ForwardingHeaders/wtf/HashFunctions.h: Added.

File:

• trunk/JavaScriptCore/kjs/JSObject.h (modified) (7 diffs)

trunk/JavaScriptCore/kjs/JSObject.h

@@ -75 +75 @@
         StructureID* inheritorID();
 
+        PropertyStorage& propertyStorage() { return m_propertyStorage; }
+
         virtual UString className() const;
 
@@ -121 +123 @@
 
         // This get function only looks at the property map.
-        JSValue* getDirect(const Identifier& propertyName) const { return m_propertyMap.get(propertyName); }
-        JSValue** getDirectLocation(const Identifier& propertyName) { return m_propertyMap.getLocation(propertyName); }
-        JSValue** getDirectLocation(const Identifier& propertyName, bool& isWriteable) { return m_propertyMap.getLocation(propertyName, isWriteable); }
-        size_t offsetForLocation(JSValue** location) { return m_propertyMap.offsetForLocation(location); }
+        JSValue* getDirect(const Identifier& propertyName) const
+        {
+            return m_structureID->propertyMap().get(propertyName, m_propertyStorage);
+        }
+
+        JSValue** getDirectLocation(const Identifier& propertyName)
+        {
+            return m_structureID->propertyMap().getLocation(propertyName, m_propertyStorage);
+        }
+
+        JSValue** getDirectLocation(const Identifier& propertyName, bool& isWriteable)
+        {
+            return m_structureID->propertyMap().getLocation(propertyName, isWriteable, m_propertyStorage);
+        }
+
+        size_t offsetForLocation(JSValue** location)
+        {
+            return location - m_propertyStorage.get();
+        }
+
         void removeDirect(const Identifier& propertyName);
-        bool hasCustomProperties() { return !m_propertyMap.isEmpty(); }
-        bool hasGetterSetterProperties() { return m_propertyMap.hasGetterSetterProperties(); }
+        bool hasCustomProperties() { return !m_structureID->propertyMap().isEmpty(); }
+        bool hasGetterSetterProperties() { return m_structureID->propertyMap().hasGetterSetterProperties(); }
 
         void putDirect(const Identifier& propertyName, JSValue* value, unsigned attr = 0);
@@ -134 +152 @@
 
         // Fast access to known property offsets.
-        JSValue* getDirectOffset(size_t offset) { return m_propertyMap.getOffset(offset); }
-        void putDirectOffset(size_t offset, JSValue* v) { m_propertyMap.putOffset(offset, v); }
+        JSValue* getDirectOffset(size_t offset) { return m_propertyStorage[offset]; }
+        void putDirectOffset(size_t offset, JSValue* value) { m_propertyStorage[offset] = value; }
 
         void fillGetterPropertySlot(PropertySlot&, JSValue** location);
@@ -159 +177 @@
         StructureID* createInheritorID();
 
-        PropertyMap m_propertyMap;
+        PropertyStorage m_propertyStorage;
         RefPtr<StructureID> m_inheritorID;
     };
@@ -285 +303 @@
 {
     if (JSValue** location = getDirectLocation(propertyName, slotIsWriteable)) {
-        if (m_propertyMap.hasGetterSetterProperties() && location[0]->isGetterSetter()) {
+        if (m_structureID->propertyMap().hasGetterSetterProperties() && location[0]->isGetterSetter()) {
             slotIsWriteable = false;
             fillGetterPropertySlot(slot, location);
@@ -309 +327 @@
 {
     if (JSValue** location = getDirectLocation(propertyName)) {
-        if (m_propertyMap.hasGetterSetterProperties() && location[0]->isGetterSetter())
+        if (m_structureID->propertyMap().hasGetterSetterProperties() && location[0]->isGetterSetter())
             fillGetterPropertySlot(slot, location);
         else
@@ -331 +349 @@
 }
 
-inline void JSObject::putDirect(const Identifier& propertyName, JSValue* value, unsigned attr, bool checkReadOnly, PutPropertySlot& slot)
+inline void JSObject::putDirect(const Identifier& propertyName, JSValue* value, unsigned attributes, bool checkReadOnly, PutPropertySlot& slot)
 {
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
-    m_propertyMap.put(propertyName, value, attr, checkReadOnly, this, slot);
-    if (slot.type() == PutPropertySlot::NewProperty) {
-        if (!m_structureID->isDictionary()) {
-            RefPtr<StructureID> structureID = StructureID::addPropertyTransition(m_structureID, propertyName);
-            setStructureID(structureID.release());
-        }
-    }
+
+     if (m_structureID->isDictionary()) {
+         m_structureID->propertyMap().put(propertyName, value, attributes, checkReadOnly, this, slot, m_propertyStorage);
+         return;
+     }
+ 
+     bool isWriteable;
+     size_t offset = m_structureID->propertyMap().getOffset(propertyName, isWriteable);
+     if (offset != WTF::notFound) {
+         if (checkReadOnly && !isWriteable)
+             return;
+         m_propertyStorage[offset] = value;
+         slot.setExistingProperty(this, offset);
+         return;
+     }
+ 
+     RefPtr<StructureID> structureID = StructureID::addPropertyTransition(m_structureID, propertyName, value, attributes, checkReadOnly, this, slot, m_propertyStorage);
+     setStructureID(structureID.release());
 }