src/share/vm/gc/g1/g1MarkSweep.hpp

rev 12906 : [mq]: gc_interface

@@ -23,10 +23,11 @@
  */
 
 #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"
 #include "gc/shared/generation.hpp"
 #include "memory/universe.hpp"

@@ -72,11 +73,11 @@
 };
 
 class G1PrepareCompactClosure : public HeapRegionClosure {
  protected:
   G1CollectedHeap* _g1h;
-  ModRefBarrierSet* _mrbs;
+  G1CardTable *_ct;
   CompactPoint _cp;
   uint _humongous_regions_removed;
 
   virtual void prepare_for_compaction(HeapRegion* hr, HeapWord* end);
   void prepare_for_compaction_work(CompactPoint* cp, HeapRegion* hr, HeapWord* end);

@@ -84,11 +85,11 @@
   bool is_cp_initialized() const { return _cp.space != NULL; }
 
  public:
   G1PrepareCompactClosure() :
     _g1h(G1CollectedHeap::heap()),
-    _mrbs(_g1h->g1_barrier_set()),
+    _ct(_g1h->g1_card_table()),
     _humongous_regions_removed(0) { }
 
   void update_sets();
   bool doHeapRegion(HeapRegion* hr);
 };