JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / jit / JITThunks.h

diff --git a/jit/JITThunks.h b/jit/JITThunks.h
index 9e28ecb85d96dfc4aa8fc7dc555ebf61665d9817..64a06b52a0a6f19e1c776547101307c0ec34a6db 100644 (file)
--- a/jit/JITThunks.h
+++ b/jit/JITThunks.h
@@ -34,9 +34,9 @@
 #include "MacroAssemblerCodeRef.h"
 #include "ThunkGenerator.h"
 #include "Weak.h"
 #include "MacroAssemblerCodeRef.h"
 #include "ThunkGenerator.h"
 #include "Weak.h"

+#include "WeakHandleOwner.h"

 #include "WeakInlines.h"
 #include <wtf/HashMap.h>
 #include "WeakInlines.h"
 #include <wtf/HashMap.h>

-#include <wtf/OwnPtr.h>

 #include <wtf/RefPtr.h>
 #include <wtf/ThreadingPrimitives.h>
 
 #include <wtf/RefPtr.h>
 #include <wtf/ThreadingPrimitives.h>
 


@@ -45,10 +45,11 @@ namespace JSC {
 class VM;
 class NativeExecutable;
 
 class VM;
 class NativeExecutable;
 

-class JITThunks {
+class JITThunks final : private WeakHandleOwner {
+    WTF_MAKE_FAST_ALLOCATED;

 public:
     JITThunks();
 public:
     JITThunks();

-    ~JITThunks();
+    virtual ~JITThunks();

 
     MacroAssemblerCodePtr ctiNativeCall(VM*);
     MacroAssemblerCodePtr ctiNativeConstruct(VM*);
 
     MacroAssemblerCodePtr ctiNativeCall(VM*);
     MacroAssemblerCodePtr ctiNativeConstruct(VM*);


@@ -65,11 +66,13 @@ private:
     // Main thread can hold this lock for a while, so use an adaptive mutex.
     typedef Mutex Lock;
     typedef MutexLocker Locker;
     // Main thread can hold this lock for a while, so use an adaptive mutex.
     typedef Mutex Lock;
     typedef MutexLocker Locker;

+
+    void finalize(Handle<Unknown>, void* context) override;

     
     typedef HashMap<ThunkGenerator, MacroAssemblerCodeRef> CTIStubMap;
     CTIStubMap m_ctiStubMap;
     typedef HashMap<std::pair<NativeFunction, NativeFunction>, Weak<NativeExecutable>> HostFunctionStubMap;
     
     typedef HashMap<ThunkGenerator, MacroAssemblerCodeRef> CTIStubMap;
     CTIStubMap m_ctiStubMap;
     typedef HashMap<std::pair<NativeFunction, NativeFunction>, Weak<NativeExecutable>> HostFunctionStubMap;

-    OwnPtr<HostFunctionStubMap> m_hostFunctionStubMap;
+    std::unique_ptr<HostFunctionStubMap> m_hostFunctionStubMap;

     Lock m_lock;
 };
 
     Lock m_lock;
 };