src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp

*** 30,10 ***
--- 30,11 ---
  #include "memory/allocation.hpp"
  
  class G1CollectedHeap;
  class G1CMBitMap;
  class G1FullCollector;
+ class SlidingForwarding;
  class G1FullGCCompactionPoint;
  class HeapRegion;
  
  // Determines the regions in the heap that should be part of the compaction and
  // distributes them among the compaction queues in round-robin fashion.

*** 106,27 ***
      bool do_heap_region(HeapRegion* hr);
    };
  
    class G1PrepareCompactLiveClosure : public StackObj {
      G1FullGCCompactionPoint* _cp;
  
    public:
      G1PrepareCompactLiveClosure(G1FullGCCompactionPoint* cp);
      size_t apply(oop object);
    };
  };
  
  // Closure to re-prepare objects in the serial compaction point queue regions for
  // serial compaction.
! class G1SerialRePrepareClosure : public StackObj {
!   G1FullGCCompactionPoint* _cp;
!   HeapRegion* _current;
! 
! public:
!   G1SerialRePrepareClosure(G1FullGCCompactionPoint* hrcp, HeapRegion* hr) :
!     _cp(hrcp),
!     _current(hr) { }
! 
!   inline size_t apply(oop obj);
! };
  
  #endif // SHARE_GC_G1_G1FULLGCPREPARETASK_HPP
--- 107,28 ---
      bool do_heap_region(HeapRegion* hr);
    };
  
    class G1PrepareCompactLiveClosure : public StackObj {
      G1FullGCCompactionPoint* _cp;
+     SlidingForwarding* const _forwarding;
  
    public:
      G1PrepareCompactLiveClosure(G1FullGCCompactionPoint* cp);
      size_t apply(oop object);
    };
  };
  
  // Closure to re-prepare objects in the serial compaction point queue regions for
  // serial compaction.
! //class G1SerialRePrepareClosure : public StackObj {
! //  G1FullGCCompactionPoint* _cp;
! //  HeapRegion* _current;
! //
! //public:
! //  G1SerialRePrepareClosure(G1FullGCCompactionPoint* hrcp, HeapRegion* hr) :
! //    _cp(hrcp),
! //    _current(hr) { }
! //
! //  inline size_t apply(oop obj);
! //};
  
  #endif // SHARE_GC_G1_G1FULLGCPREPARETASK_HPP