Changeset 92058 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

Timestamp:

Jul 30, 2011, 4:10:19 PM (14 years ago)

Author:

[email protected]

Message:

Reduce the size of JSGlobalObject slightly
​https://bugs.webkit.org/show_bug.cgi?id=65417

Reviewed by Dan Bernstein.

Push a few members that either aren't commonly used,
or aren't frequently accessed into a separate struct.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::WeakMapsFinalizer::finalize):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::JSGlobalObjectRareData::JSGlobalObjectRareData):
(JSC::JSGlobalObject::createRareDataIfNeeded):
(JSC::JSGlobalObject::setProfileGroup):
(JSC::JSGlobalObject::profileGroup):
(JSC::JSGlobalObject::registerWeakMap):
(JSC::JSGlobalObject::deregisterWeakMap):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -55 +55 @@
     
     class JSGlobalObject : public JSVariableObject {
+    private:
+        typedef HashSet<RefPtr<OpaqueJSWeakObjectMap> > WeakMapSet;
+
+        class WeakMapsFinalizer : public WeakHandleOwner {
+        public:
+            virtual void finalize(Handle<Unknown>, void* context);
+        };
+
+        struct JSGlobalObjectRareData {
+            JSGlobalObjectRareData()
+                : profileGroup(0)
+            {
+            }
+
+            WeakMapSet weakMaps;
+            unsigned profileGroup;
+            Weak<JSGlobalObject> weakMapsFinalizer;
+        };
+
     protected:
-        typedef HashSet<RefPtr<OpaqueJSWeakObjectMap> > WeakMapSet;
 
         RefPtr<JSGlobalData> m_globalData;
@@ -105 +123 @@
         WriteBarrier<Structure> m_internalFunctionStructure;
 
-        unsigned m_profileGroup;
         Debugger* m_debugger;
 
-        WeakMapSet m_weakMaps;
-        Weak<JSGlobalObject> m_weakMapsFinalizer;
-        class WeakMapsFinalizer : public WeakHandleOwner {
-        public:
-            virtual void finalize(Handle<Unknown>, void* context);
-        };
+        OwnPtr<JSGlobalObjectRareData> m_rareData;
         static WeakMapsFinalizer* weakMapsFinalizer();
 
@@ -122 +134 @@
         bool m_evalEnabled;
 
+        void createRareDataIfNeeded()
+        {
+            if (!m_rareData)
+                m_rareData = adoptPtr(new JSGlobalObjectRareData);
+        }
+        
     public:
         static JSGlobalObject* create(JSGlobalData& globalData, Structure* structure)
@@ -218 +236 @@
         Structure* stringObjectStructure() const { return m_stringObjectStructure.get(); }
 
-        void setProfileGroup(unsigned value) { m_profileGroup = value; }
-        unsigned profileGroup() const { return m_profileGroup; }
+        void setProfileGroup(unsigned value) { createRareDataIfNeeded(); m_rareData->profileGroup = value; }
+        unsigned profileGroup() const
+        { 
+            if (!m_rareData)
+                return 0;
+            return m_rareData->profileGroup;
+        }
 
         Debugger* debugger() const { return m_debugger; }
@@ -255 +278 @@
         void registerWeakMap(OpaqueJSWeakObjectMap* map)
         {
-            if (!m_weakMapsFinalizer)
-                m_weakMapsFinalizer.set(globalData(), this, weakMapsFinalizer());
-            m_weakMaps.add(map);
+            createRareDataIfNeeded();
+            if (!m_rareData->weakMapsFinalizer)
+                m_rareData->weakMapsFinalizer.set(globalData(), this, weakMapsFinalizer());
+            m_rareData->weakMaps.add(map);
         }
 
         void deregisterWeakMap(OpaqueJSWeakObjectMap* map)
         {
-            m_weakMaps.remove(map);
+            if (m_rareData)
+                m_rareData->weakMaps.remove(map);
         }