Changeset 38016 in webkit for trunk/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Oct 30, 2008, 5:12:50 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-30 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich and Geoffrey Garen.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21989
Merge PropertyMap and StructureID

• Move PropertyMap code into StructureID in preparation for lazily creating the map on gets.
• Make remove with transition explicit by adding removePropertyTransition.
• Make the put/remove without transition explicit.
• Make cache invalidation part of put/remove without transition.

1% speedup on SunSpider; 0.5% speedup on v8 suite.

• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• kjs/AllInOneFile.cpp:
• kjs/identifier.h:
• runtime/JSObject.cpp: (JSC::JSObject::removeDirect):
• runtime/JSObject.h: (JSC::JSObject::putDirect):
• runtime/PropertyMap.cpp: Removed.
• runtime/PropertyMap.h: Removed.
• runtime/PropertyMapHashTable.h: Copied from runtime/PropertyMap.h.
• runtime/StructureID.cpp: (JSC::StructureID::dumpStatistics): (JSC::StructureID::StructureID): (JSC::StructureID::~StructureID): (JSC::StructureID::getEnumerablePropertyNames): (JSC::StructureID::addPropertyTransition): (JSC::StructureID::removePropertyTransition): (JSC::StructureID::toDictionaryTransition): (JSC::StructureID::changePrototypeTransition): (JSC::StructureID::getterSetterTransition): (JSC::StructureID::addPropertyWithoutTransition): (JSC::StructureID::removePropertyWithoutTransition): (JSC::PropertyMapStatisticsExitLogger::~PropertyMapStatisticsExitLogger): (JSC::StructureID::checkConsistency): (JSC::StructureID::copyPropertyTable): (JSC::StructureID::get): (JSC::StructureID::put): (JSC::StructureID::remove): (JSC::StructureID::insertIntoPropertyMapHashTable): (JSC::StructureID::expandPropertyMapHashTable): (JSC::StructureID::createPropertyMapHashTable): (JSC::StructureID::rehashPropertyMapHashTable): (JSC::comparePropertyMapEntryIndices): (JSC::StructureID::getEnumerablePropertyNamesInternal):
• runtime/StructureID.h: (JSC::StructureID::propertyStorageSize): (JSC::StructureID::isEmpty): (JSC::StructureID::get):

File:

• trunk/JavaScriptCore/runtime/JSObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSObject.cpp

@@ -468 +468 @@
     size_t offset;
     if (m_structureID->isDictionary()) {
-        offset = m_structureID->remove(propertyName);
-        if (offset != WTF::notFound) {
+        offset = m_structureID->removePropertyWithoutTransition(propertyName);
+        if (offset != WTF::notFound)
             m_propertyStorage[offset] = jsUndefined();
-            m_structureID->clearEnumerationCache();
-        }
         return;
     }
 
-    RefPtr<StructureID> structureID = StructureID::toDictionaryTransition(m_structureID);
-    offset = structureID->remove(propertyName);
+    RefPtr<StructureID> structureID = StructureID::removePropertyTransition(m_structureID, propertyName, offset);
     if (offset != WTF::notFound)
         m_propertyStorage[offset] = jsUndefined();