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

Timestamp:

Oct 5, 2011, 3:44:36 PM (14 years ago)

Author:

[email protected]

Message:

Added a simpler mechanism for registering one-off finalizers
​https://bugs.webkit.org/show_bug.cgi?id=69466

Reviewed by Oliver Hunt.

• heap/Heap.cpp:

(JSC::Heap::addFinalizer):
(JSC::Heap::FinalizerOwner::finalize):

• heap/Heap.h: New function for adding an arbitrary finalizer for an

arbitrary cell without declaring any special classes or Handles yourself.

• JavaScriptCore.exp: Fix build.

• runtime/Executable.cpp:

(JSC::ExecutableBase::clearCode):
(JSC::ExecutableBase::clearCodeVirtual):
(JSC::EvalExecutable::clearCodeVirtual):
(JSC::ProgramExecutable::clearCodeVirtual):
(JSC::FunctionExecutable::discardCode):
(JSC::FunctionExecutable::clearCodeVirtual):

• runtime/Executable.h:

(JSC::ExecutableBase::finishCreation): Use the new mechanism for eager
finalization of executables.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::clearRareData):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::createRareDataIfNeeded):
(JSC::JSGlobalObject::registerWeakMap): Use the new mechanism for eager
finalization of weak maps.

File:

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

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -58 +58 @@
         typedef HashSet<RefPtr<OpaqueJSWeakObjectMap> > WeakMapSet;
 
-        class WeakMapsFinalizer : public WeakHandleOwner {
-        public:
-            virtual void finalize(Handle<Unknown>, void* context);
-        };
-
         struct JSGlobalObjectRareData {
             JSGlobalObjectRareData()
@@ -71 +66 @@
             WeakMapSet weakMaps;
             unsigned profileGroup;
-            Weak<JSGlobalObject> weakMapsFinalizer;
         };
 
@@ -129 +123 @@
 
         OwnPtr<JSGlobalObjectRareData> m_rareData;
-        static WeakMapsFinalizer* weakMapsFinalizer();
 
         WeakRandom m_weakRandom;
@@ -139 +132 @@
         void createRareDataIfNeeded()
         {
-            if (!m_rareData)
-                m_rareData = adoptPtr(new JSGlobalObjectRareData);
+            if (m_rareData)
+                return;
+            m_rareData = adoptPtr(new JSGlobalObjectRareData);
+            Heap::heap(this)->addFinalizer(this, clearRareData);
         }
         
@@ -281 +276 @@
         {
             createRareDataIfNeeded();
-            if (!m_rareData->weakMapsFinalizer)
-                m_rareData->weakMapsFinalizer.set(globalData(), this, weakMapsFinalizer());
             m_rareData->weakMaps.add(map);
         }
@@ -317 +310 @@
 
         void setRegisters(WriteBarrier<Unknown>* registers, PassOwnArrayPtr<WriteBarrier<Unknown> > registerArray, size_t count);
+        static void clearRareData(JSCell*);
     };