src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp

*** 26,37 ****
  #define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP
  
  #include "gc_implementation/g1/concurrentMark.hpp"
  #include "gc_implementation/g1/g1AllocRegion.hpp"
  #include "gc_implementation/g1/g1HRPrinter.hpp"
- #include "gc_implementation/g1/g1RemSet.hpp"
  #include "gc_implementation/g1/g1MonitoringSupport.hpp"
  #include "gc_implementation/g1/heapRegionSeq.hpp"
  #include "gc_implementation/g1/heapRegionSets.hpp"
  #include "gc_implementation/shared/hSpaceCounters.hpp"
  #include "gc_implementation/shared/parGCAllocBuffer.hpp"
  #include "memory/barrierSet.hpp"
--- 26,38 ----
  #define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP
  
  #include "gc_implementation/g1/concurrentMark.hpp"
  #include "gc_implementation/g1/g1AllocRegion.hpp"
  #include "gc_implementation/g1/g1HRPrinter.hpp"
  #include "gc_implementation/g1/g1MonitoringSupport.hpp"
+ #include "gc_implementation/g1/g1PreserveMarkQueue.hpp"
+ #include "gc_implementation/g1/g1RemSet.hpp"
  #include "gc_implementation/g1/heapRegionSeq.hpp"
  #include "gc_implementation/g1/heapRegionSets.hpp"
  #include "gc_implementation/shared/hSpaceCounters.hpp"
  #include "gc_implementation/shared/parGCAllocBuffer.hpp"
  #include "memory/barrierSet.hpp"
*** 875,888 ****
  
    // Failed evacuations cause some logical from-space objects to have
    // forwarding pointers to themselves.  Reset them.
    void remove_self_forwarding_pointers();
  
!   // When one is non-null, so is the other.  Together, they each pair is
!   // an object with a preserved mark, and its mark value.
!   GrowableArray<oop>*     _objs_with_preserved_marks;
!   GrowableArray<markOop>* _preserved_marks_of_objs;
  
    // Preserve the mark of "obj", if necessary, in preparation for its mark
    // word being overwritten with a self-forwarding-pointer.
    void preserve_mark_if_necessary(oop obj, markOop m);
  
--- 876,887 ----
  
    // Failed evacuations cause some logical from-space objects to have
    // forwarding pointers to themselves.  Reset them.
    void remove_self_forwarding_pointers();
  
!   // Objects with a preserved mark, and its mark value.
!   G1PreserveMarkQueue _preserved_marks;
  
    // Preserve the mark of "obj", if necessary, in preparation for its mark
    // word being overwritten with a self-forwarding-pointer.
    void preserve_mark_if_necessary(oop obj, markOop m);