Changeset 252671 in webkit

Timestamp:

Nov 19, 2019 6:08:26 PM (5 years ago)

Author:

Fujii Hironori

Message:

[JSC] DisallowVMReentry and DeferGC should use WTF::ThreadSpecific instead of using WTF::threadSpecificKeyCreate directly
​https://bugs.webkit.org/show_bug.cgi?id=204350

Reviewed by Yusuke Suzuki.

WTF provides two thread specific storages, ThreadSpecific and
threadSpecificKeyCreate. Only DisallowVMReentry and DeferGC were
using the latter. They should use WTF::ThreadSpecific because it
is a useful type-safe wrapper class.

• heap/DeferGC.cpp:
• heap/DeferGC.h:

(JSC::DisallowGC::initialize):
(JSC::DisallowGC::scopeReentryCount):
(JSC::DisallowGC::setScopeReentryCount):

• runtime/DisallowVMReentry.cpp:
• runtime/DisallowVMReentry.h:

(JSC::DisallowVMReentry::initialize):
(JSC::DisallowVMReentry::scopeReentryCount):
(JSC::DisallowVMReentry::setScopeReentryCount):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/DeferGC.cpp (modified) (1 diff)
• heap/DeferGC.h (modified) (2 diffs)
• runtime/DisallowVMReentry.cpp (modified) (1 diff)
• runtime/DisallowVMReentry.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-11-19  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [JSC] DisallowVMReentry and DeferGC should use WTF::ThreadSpecific instead of using WTF::threadSpecificKeyCreate directly
+        https://bugs.webkit.org/show_bug.cgi?id=204350
+
+        Reviewed by Yusuke Suzuki.
+
+        WTF provides two thread specific storages, ThreadSpecific and
+        threadSpecificKeyCreate. Only DisallowVMReentry and DeferGC were
+        using the latter. They should use WTF::ThreadSpecific because it
+        is a useful type-safe wrapper class.
+
+        * heap/DeferGC.cpp:
+        * heap/DeferGC.h:
+        (JSC::DisallowGC::initialize):
+        (JSC::DisallowGC::scopeReentryCount):
+        (JSC::DisallowGC::setScopeReentryCount):
+        * runtime/DisallowVMReentry.cpp:
+        * runtime/DisallowVMReentry.h:
+        (JSC::DisallowVMReentry::initialize):
+        (JSC::DisallowVMReentry::scopeReentryCount):
+        (JSC::DisallowVMReentry::setScopeReentryCount):
+
 2019-11-19  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/heap/DeferGC.cpp

@@ -32 +32 @@
 
 #ifndef NDEBUG
-WTF::ThreadSpecificKey DisallowGC::s_scopeReentryCount = 0;
+LazyNeverDestroyed<ThreadSpecific<unsigned, WTF::CanBeGCThread::True>> DisallowGC::s_scopeReentryCount;
 #endif
 

trunk/Source/JavaScriptCore/heap/DeferGC.h

@@ -28 +28 @@
 #include "DisallowScope.h"
 #include "Heap.h"
+#include <wtf/NeverDestroyed.h>
 #include <wtf/ThreadSpecific.h>
 
@@ -90 +91 @@
     static void initialize()
     {
-        WTF::threadSpecificKeyCreate(&s_scopeReentryCount, 0);
+        s_scopeReentryCount.construct();
     }
 
 private:
-    static uintptr_t scopeReentryCount()
+    static unsigned scopeReentryCount()
     {
-        return reinterpret_cast<uintptr_t>(WTF::threadSpecificGet(s_scopeReentryCount));
+        return *s_scopeReentryCount.get();
     }
-    static void setScopeReentryCount(uintptr_t value)
+    static void setScopeReentryCount(unsigned value)
     {
-        WTF::threadSpecificSet(s_scopeReentryCount, reinterpret_cast<void*>(value));
+        *s_scopeReentryCount.get() = value;
     }
     
-    JS_EXPORT_PRIVATE static WTF::ThreadSpecificKey s_scopeReentryCount;
+    JS_EXPORT_PRIVATE static LazyNeverDestroyed<ThreadSpecific<unsigned, WTF::CanBeGCThread::True>> s_scopeReentryCount;
 
 #endif // NDEBUG

trunk/Source/JavaScriptCore/runtime/DisallowVMReentry.cpp

@@ -32 +32 @@
     
 #ifndef NDEBUG
-WTF::ThreadSpecificKey DisallowVMReentry::s_scopeReentryCount = 0;
+LazyNeverDestroyed<ThreadSpecific<unsigned, WTF::CanBeGCThread::True>> DisallowVMReentry::s_scopeReentryCount;
 #endif
     

trunk/Source/JavaScriptCore/runtime/DisallowVMReentry.h

@@ -27 +27 @@
 
 #include "DisallowScope.h"
+#include <wtf/NeverDestroyed.h>
 #include <wtf/ThreadSpecific.h>
 
@@ -48 +49 @@
     static void initialize()
     {
-        WTF::threadSpecificKeyCreate(&s_scopeReentryCount, 0);
+        s_scopeReentryCount.construct();
     }
 
 private:
-    static uintptr_t scopeReentryCount()
+    static unsigned scopeReentryCount()
     {
-        return reinterpret_cast<uintptr_t>(WTF::threadSpecificGet(s_scopeReentryCount));
+        return *s_scopeReentryCount.get();
     }
-    static void setScopeReentryCount(uintptr_t value)
+    static void setScopeReentryCount(unsigned value)
     {
-        WTF::threadSpecificSet(s_scopeReentryCount, reinterpret_cast<void*>(value));
+        *s_scopeReentryCount.get() = value;
     }
 
-    JS_EXPORT_PRIVATE static WTF::ThreadSpecificKey s_scopeReentryCount;
+    JS_EXPORT_PRIVATE static LazyNeverDestroyed<ThreadSpecific<unsigned, WTF::CanBeGCThread::True>> s_scopeReentryCount;
 
 #endif // NDEBUG