Changeset 141681 in webkit

Timestamp:

Feb 1, 2013 7:57:42 PM (11 years ago)

Author:

mhahnenberg@apple.com

Message:

Structure::m_enumerationCache should be moved to StructureRareData
​https://bugs.webkit.org/show_bug.cgi?id=108723

Reviewed by Oliver Hunt.

m_enumerationCache is only used by objects whose properties are iterated over, so not every Structure needs this
field and it can therefore be moved safely to StructureRareData to help with memory savings.

• runtime/JSPropertyNameIterator.h:

(JSPropertyNameIterator):
(JSC::Register::propertyNameIterator):
(JSC::StructureRareData::enumerationCache): Add to JSPropertyNameIterator.h so that it can see the correct type.
(JSC::StructureRareData::setEnumerationCache): Ditto.

• runtime/Structure.cpp:

(JSC::Structure::addPropertyWithoutTransition): Use the enumerationCache() getter rather than accessing the field.
(JSC::Structure::removePropertyWithoutTransition): Ditto.
(JSC::Structure::visitChildren): We no longer have to worry about marking the m_enumerationCache field.

• runtime/Structure.h:

(JSC::Structure::setEnumerationCache): Move the old accessors back since we don't have to have any knowledge of
the JSPropertyNameIterator type.
(JSC::Structure::enumerationCache): Ditto.

• runtime/StructureRareData.cpp:

(JSC::StructureRareData::visitChildren): Mark the new m_enumerationCache field.

• runtime/StructureRareData.h: Add new functions/fields.

(StructureRareData):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSPropertyNameIterator.h (modified) (3 diffs)
• runtime/Structure.cpp (modified) (3 diffs)
• runtime/Structure.h (modified) (2 diffs)
• runtime/StructureRareData.cpp (modified) (1 diff)
• runtime/StructureRareData.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-02-01  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Structure::m_enumerationCache should be moved to StructureRareData
+        https://bugs.webkit.org/show_bug.cgi?id=108723
+
+        Reviewed by Oliver Hunt.
+
+        m_enumerationCache is only used by objects whose properties are iterated over, so not every Structure needs this 
+        field and it can therefore be moved safely to StructureRareData to help with memory savings.
+
+        * runtime/JSPropertyNameIterator.h:
+        (JSPropertyNameIterator):
+        (JSC::Register::propertyNameIterator):
+        (JSC::StructureRareData::enumerationCache): Add to JSPropertyNameIterator.h so that it can see the correct type.
+        (JSC::StructureRareData::setEnumerationCache): Ditto.
+        * runtime/Structure.cpp:
+        (JSC::Structure::addPropertyWithoutTransition): Use the enumerationCache() getter rather than accessing the field.
+        (JSC::Structure::removePropertyWithoutTransition): Ditto.
+        (JSC::Structure::visitChildren): We no longer have to worry about marking the m_enumerationCache field.
+        * runtime/Structure.h: 
+        (JSC::Structure::setEnumerationCache): Move the old accessors back since we don't have to have any knowledge of 
+        the JSPropertyNameIterator type.
+        (JSC::Structure::enumerationCache): Ditto.
+        * runtime/StructureRareData.cpp:
+        (JSC::StructureRareData::visitChildren): Mark the new m_enumerationCache field.
+        * runtime/StructureRareData.h: Add new functions/fields.
+        (StructureRareData):
+
 2013-02-01  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h

@@ -74 +74 @@
         StructureChain* cachedPrototypeChain() { return m_cachedPrototypeChain.get(); }
         
-        static const ClassInfo s_info;
+        static JS_EXPORTDATA const ClassInfo s_info;
 
     protected:
@@ -99 +99 @@
     };
 
-    inline void Structure::setEnumerationCache(JSGlobalData& globalData, JSPropertyNameIterator* enumerationCache)
-    {
-        ASSERT(!isDictionary());
-        m_enumerationCache.set(globalData, this, enumerationCache);
-    }
-
-    inline JSPropertyNameIterator* Structure::enumerationCache()
-    {
-        return m_enumerationCache.get();
-    }
-
     ALWAYS_INLINE JSPropertyNameIterator* Register::propertyNameIterator() const
     {
@@ -115 +104 @@
     }
 
+    inline JSPropertyNameIterator* StructureRareData::enumerationCache()
+    {
+        return m_enumerationCache.get();
+    }
+    
+    inline void StructureRareData::setEnumerationCache(JSGlobalData& globalData, const Structure* owner, JSPropertyNameIterator* value)
+    {
+        m_enumerationCache.set(globalData, owner, value);
+    }
+
 } // namespace JSC
 

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -646 +646 @@
 PropertyOffset Structure::addPropertyWithoutTransition(JSGlobalData& globalData, PropertyName propertyName, unsigned attributes, JSCell* specificValue)
 {
-    ASSERT(!m_enumerationCache);
+    ASSERT(!enumerationCache());
 
     if (m_specificFunctionThrashCount == maxSpecificFunctionThrashCount)
@@ -661 +661 @@
 {
     ASSERT(isUncacheableDictionary());
-    ASSERT(!m_enumerationCache);
+    ASSERT(!enumerationCache());
 
     materializePropertyMapIfNecessaryForPinning(globalData);
@@ -860 +860 @@
     visitor.append(&thisObject->m_previousOrRareData);
     visitor.append(&thisObject->m_specificValueInPrevious);
-    visitor.append(&thisObject->m_enumerationCache);
     if (thisObject->m_propertyTable) {
         PropertyTable::iterator end = thisObject->m_propertyTable->end();

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -477 +477 @@
         StructureTransitionTable m_transitionTable;
 
-        WriteBarrier<JSPropertyNameIterator> m_enumerationCache;
-
         OwnPtr<PropertyTable> m_propertyTable;
 
@@ -585 +583 @@
     }
 
+    inline void Structure::setEnumerationCache(JSGlobalData& globalData, JSPropertyNameIterator* enumerationCache)
+    {
+        ASSERT(!isDictionary());
+        if (!typeInfo().structureHasRareData())
+            allocateRareData(globalData);
+        rareData()->setEnumerationCache(globalData, this, enumerationCache);
+    }
+
+    inline JSPropertyNameIterator* Structure::enumerationCache()
+    {
+        if (!typeInfo().structureHasRareData())
+            return 0;
+        return rareData()->enumerationCache();
+    }
+
 } // namespace JSC
 

trunk/Source/JavaScriptCore/runtime/StructureRareData.cpp

@@ -80 +80 @@
     visitor.append(&thisObject->m_previous);
     visitor.append(&thisObject->m_objectToStringValue);
+    visitor.append(&thisObject->m_enumerationCache);
 }
 

trunk/Source/JavaScriptCore/runtime/StructureRareData.h

@@ -33 +33 @@
 namespace JSC {
 
+class JSPropertyNameIterator;
 class Structure;
 
@@ -52 +53 @@
     void setObjectToStringValue(JSGlobalData&, const JSCell* owner, JSString* value);
 
+    JSPropertyNameIterator* enumerationCache();
+    void setEnumerationCache(JSGlobalData&, const Structure* owner, JSPropertyNameIterator* value);
+
     static JS_EXPORTDATA const ClassInfo s_info;
 
@@ -62 +66 @@
     WriteBarrier<Structure> m_previous;
     WriteBarrier<JSString> m_objectToStringValue;
+    WriteBarrier<JSPropertyNameIterator> m_enumerationCache;
 };