1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Mon Feb 02 10:38:39 2015 +0100 1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Mon Dec 08 18:57:33 2014 +0100 1.3 @@ -67,17 +67,9 @@ 1.4 // sets. 1.5 1.6 class HeapRegionDCTOC : public DirtyCardToOopClosure { 1.7 -public: 1.8 - // Specification of possible DirtyCardToOopClosure filtering. 1.9 - enum FilterKind { 1.10 - NoFilterKind, 1.11 - IntoCSFilterKind, 1.12 - OutOfRegionFilterKind 1.13 - }; 1.14 - 1.15 -protected: 1.16 +private: 1.17 HeapRegion* _hr; 1.18 - FilterKind _fk; 1.19 + G1ParPushHeapRSClosure* _rs_scan; 1.20 G1CollectedHeap* _g1; 1.21 1.22 // Walk the given memory region from bottom to (actual) top 1.23 @@ -90,9 +82,9 @@ 1.24 1.25 public: 1.26 HeapRegionDCTOC(G1CollectedHeap* g1, 1.27 - HeapRegion* hr, ExtendedOopClosure* cl, 1.28 - CardTableModRefBS::PrecisionStyle precision, 1.29 - FilterKind fk); 1.30 + HeapRegion* hr, 1.31 + G1ParPushHeapRSClosure* cl, 1.32 + CardTableModRefBS::PrecisionStyle precision); 1.33 }; 1.34 1.35 // The complicating factor is that BlockOffsetTable diverged