diff -r bdcfe8154201 -r c3a10df652c0 src/hotspot/share/runtime/thread.hpp
--- a/src/hotspot/share/runtime/thread.hpp	Wed Mar 28 22:03:57 2018 +0200
+++ b/src/hotspot/share/runtime/thread.hpp	Thu Apr 12 08:25:30 2018 +0200
@@ -1063,12 +1063,8 @@
   // Support for G1 barriers
 
   SATBMarkQueue _satb_mark_queue;        // Thread-local log for SATB barrier.
-  // Set of all such queues.
-  static SATBMarkQueueSet _satb_mark_queue_set;
 
   DirtyCardQueue _dirty_card_queue;      // Thread-local log for dirty cards.
-  // Set of all such queues.
-  static DirtyCardQueueSet _dirty_card_queue_set;
 #endif // INCLUDE_ALL_GCS
 
   friend class VMThread;
@@ -1948,15 +1944,9 @@
 #if INCLUDE_ALL_GCS
   // SATB marking queue support
   SATBMarkQueue& satb_mark_queue() { return _satb_mark_queue; }
-  static SATBMarkQueueSet& satb_mark_queue_set() {
-    return _satb_mark_queue_set;
-  }
 
   // Dirty card queue support
   DirtyCardQueue& dirty_card_queue() { return _dirty_card_queue; }
-  static DirtyCardQueueSet& dirty_card_queue_set() {
-    return _dirty_card_queue_set;
-  }
 #endif // INCLUDE_ALL_GCS
 
   // Machine dependent stuff