--- old/src/share/vm/gc/g1/g1MarkSweep.hpp	2017-04-25 16:44:38.191175082 +0200
+++ new/src/share/vm/gc/g1/g1MarkSweep.hpp	2017-04-25 16:44:38.079175086 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_G1_G1MARKSWEEP_HPP
 #define SHARE_VM_GC_G1_G1MARKSWEEP_HPP
 
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "gc/serial/genMarkSweep.hpp"
@@ -74,7 +75,7 @@
 class G1PrepareCompactClosure : public HeapRegionClosure {
  protected:
   G1CollectedHeap* _g1h;
-  ModRefBarrierSet* _mrbs;
+  G1CardTable *_ct;
   CompactPoint _cp;
   uint _humongous_regions_removed;
 
@@ -86,7 +87,7 @@
  public:
   G1PrepareCompactClosure() :
     _g1h(G1CollectedHeap::heap()),
-    _mrbs(_g1h->g1_barrier_set()),
+    _ct(_g1h->g1_card_table()),
     _humongous_regions_removed(0) { }
 
   void update_sets();