Changeset 253500 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Dec 13, 2019, 2:37:52 PM (5 years ago)

Author:

[email protected]

Message:

Add a Heap::finalize function that takes WTF::Function<void()>
​https://bugs.webkit.org/show_bug.cgi?id=205211

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• heap/Heap.cpp:

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

• heap/Heap.h:

Source/WTF:

• wtf/Function.h:

(WTF::Function<Out):

Location:

trunk/Source/JavaScriptCore/heap

Files:

• Heap.cpp (modified) (1 diff)
• Heap.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -2436 +2436 @@
 }
 
-void Heap::addFinalizer(JSCell* cell, Finalizer finalizer)
-{
-    WeakSet::allocate(cell, &m_finalizerOwner, reinterpret_cast<void*>(finalizer)); // Balanced by FinalizerOwner::finalize().
-}
-
-void Heap::FinalizerOwner::finalize(Handle<Unknown> handle, void* context)
+void Heap::addFinalizer(JSCell* cell, CFinalizer finalizer)
+{
+    WeakSet::allocate(cell, &m_cFinalizerOwner, bitwise_cast<void*>(finalizer)); // Balanced by CFinalizerOwner::finalize().
+}
+
+void Heap::addFinalizer(JSCell* cell, LambdaFinalizer function)
+{
+    WeakSet::allocate(cell, &m_lambdaFinalizerOwner, function.leakImpl()); // Balanced by LambdaFinalizerOwner::finalize().
+}
+
+void Heap::CFinalizerOwner::finalize(Handle<Unknown> handle, void* context)
 {
     HandleSlot slot = handle.slot();
-    Finalizer finalizer = reinterpret_cast<Finalizer>(context);
+    CFinalizer finalizer = bitwise_cast<CFinalizer>(context);
+    finalizer(slot->asCell());
+    WeakSet::deallocate(WeakImpl::asWeakImpl(slot));
+}
+
+void Heap::LambdaFinalizerOwner::finalize(Handle<Unknown> handle, void* context)
+{
+    LambdaFinalizer::Impl* impl = bitwise_cast<LambdaFinalizer::Impl*>(context);
+    LambdaFinalizer finalizer(impl);
+    HandleSlot slot = handle.slot();
     finalizer(slot->asCell());
     WeakSet::deallocate(WeakImpl::asWeakImpl(slot));

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -172 +172 @@
     JS_EXPORT_PRIVATE bool isCurrentThreadBusy();
     
-    typedef void (*Finalizer)(JSCell*);
-    JS_EXPORT_PRIVATE void addFinalizer(JSCell*, Finalizer);
+    typedef void (*CFinalizer)(JSCell*);
+    JS_EXPORT_PRIVATE void addFinalizer(JSCell*, CFinalizer);
+    using LambdaFinalizer = WTF::Function<void(JSCell*)>;
+    JS_EXPORT_PRIVATE void addFinalizer(JSCell*, LambdaFinalizer);
 
     void notifyIsSafeToCollect();
@@ -432 +434 @@
     static constexpr size_t minExtraMemory = 256;
     
-    class FinalizerOwner : public WeakHandleOwner {
+    class CFinalizerOwner : public WeakHandleOwner {
+        void finalize(Handle<Unknown>, void* context) override;
+    };
+
+    class LambdaFinalizerOwner : public WeakHandleOwner {
         void finalize(Handle<Unknown>, void* context) override;
     };
@@ -635 +641 @@
     std::unique_ptr<CodeBlockSet> m_codeBlocks;
     std::unique_ptr<JITStubRoutineSet> m_jitStubRoutines;
-    FinalizerOwner m_finalizerOwner;
+    CFinalizerOwner m_cFinalizerOwner;
+    LambdaFinalizerOwner m_lambdaFinalizerOwner;
     
     Lock m_parallelSlotVisitorLock;