src/hotspot/share/runtime/thread.cpp

@@ -112,10 +112,11 @@
 #include "utilities/macros.hpp"
 #include "utilities/preserveException.hpp"
 #include "utilities/vmError.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/parallel/pcTasks.hpp"
 #endif // INCLUDE_ALL_GCS
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciCompiler.hpp"

@@ -1586,20 +1587,15 @@
   }
 
   pd_initialize();
 }
 
-#if INCLUDE_ALL_GCS
-SATBMarkQueueSet JavaThread::_satb_mark_queue_set;
-DirtyCardQueueSet JavaThread::_dirty_card_queue_set;
-#endif // INCLUDE_ALL_GCS
-
 JavaThread::JavaThread(bool is_attaching_via_jni) :
                        Thread()
 #if INCLUDE_ALL_GCS
-                       , _satb_mark_queue(&_satb_mark_queue_set),
-                       _dirty_card_queue(&_dirty_card_queue_set)
+                       , _satb_mark_queue(&G1BarrierSet::satb_mark_queue_set()),
+                       _dirty_card_queue(&G1BarrierSet::dirty_card_queue_set())
 #endif // INCLUDE_ALL_GCS
 {
   initialize();
   if (is_attaching_via_jni) {
     _jni_attach_state = _attaching_via_jni;

@@ -1661,12 +1657,12 @@
 static void sweeper_thread_entry(JavaThread* thread, TRAPS);
 
 JavaThread::JavaThread(ThreadFunction entry_point, size_t stack_sz) :
                        Thread()
 #if INCLUDE_ALL_GCS
-                       , _satb_mark_queue(&_satb_mark_queue_set),
-                       _dirty_card_queue(&_dirty_card_queue_set)
+                       , _satb_mark_queue(&G1BarrierSet::satb_mark_queue_set()),
+                       _dirty_card_queue(&G1BarrierSet::dirty_card_queue_set())
 #endif // INCLUDE_ALL_GCS
 {
   initialize();
   _jni_attach_state = _not_attaching_via_jni;
   set_entry_point(entry_point);