--- old/src/share/vm/gc/g1/g1RemSetSummary.cpp	2017-04-25 16:44:41.775174957 +0200
+++ new/src/share/vm/gc/g1/g1RemSetSummary.cpp	2017-04-25 16:44:41.659174961 +0200
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/concurrentG1Refine.hpp"
 #include "gc/g1/concurrentG1RefineThread.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1RemSet.inline.hpp"
 #include "gc/g1/g1RemSetSummary.hpp"
@@ -53,7 +54,7 @@
 
 void G1RemSetSummary::update() {
   _num_refined_cards = remset()->conc_refine_cards();
-  DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+  DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
   _num_processed_buf_mutator = dcqs.processed_buffers_mut();
   _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();