--- old/src/share/vm/gc/g1/dirtyCardQueue.cpp	2017-04-25 16:44:29.027175401 +0200
+++ new/src/share/vm/gc/g1/dirtyCardQueue.cpp	2017-04-25 16:44:28.883175406 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/shared/workgroup.hpp"
@@ -98,10 +99,10 @@
   }
 }
 
-DirtyCardQueue::DirtyCardQueue(DirtyCardQueueSet* qset, bool permanent) :
+DirtyCardQueue::DirtyCardQueue(DirtyCardQueueSet* dcqs, bool permanent) :
   // Dirty card queues are always active, so we create them with their
   // active field set to true.
-  PtrQueue(qset, permanent, true /* active */)
+  PtrQueue(dcqs != NULL ? dcqs : &G1BarrierSet::dirty_card_queue_set(), permanent, true /* active */)
 { }
 
 DirtyCardQueue::~DirtyCardQueue() {