1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Jun 25 08:56:57 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Jun 25 10:55:10 2014 +0200
1.3 @@ -71,7 +71,7 @@
1.4 // in the concurrent marker used by G1 to filter remembered
1.5 // sets.
1.6
1.7 -class HeapRegionDCTOC : public ContiguousSpaceDCTOC {
1.8 +class HeapRegionDCTOC : public DirtyCardToOopClosure {
1.9 public:
1.10 // Specification of possible DirtyCardToOopClosure filtering.
1.11 enum FilterKind {
1.12 @@ -85,39 +85,13 @@
1.13 FilterKind _fk;
1.14 G1CollectedHeap* _g1;
1.15
1.16 - void walk_mem_region_with_cl(MemRegion mr,
1.17 - HeapWord* bottom, HeapWord* top,
1.18 - ExtendedOopClosure* cl);
1.19 -
1.20 - // We don't specialize this for FilteringClosure; filtering is handled by
1.21 - // the "FilterKind" mechanism. But we provide this to avoid a compiler
1.22 - // warning.
1.23 - void walk_mem_region_with_cl(MemRegion mr,
1.24 - HeapWord* bottom, HeapWord* top,
1.25 - FilteringClosure* cl) {
1.26 - HeapRegionDCTOC::walk_mem_region_with_cl(mr, bottom, top,
1.27 - (ExtendedOopClosure*)cl);
1.28 - }
1.29 -
1.30 - // Get the actual top of the area on which the closure will
1.31 - // operate, given where the top is assumed to be (the end of the
1.32 - // memory region passed to do_MemRegion) and where the object
1.33 - // at the top is assumed to start. For example, an object may
1.34 - // start at the top but actually extend past the assumed top,
1.35 - // in which case the top becomes the end of the object.
1.36 - HeapWord* get_actual_top(HeapWord* top, HeapWord* top_obj) {
1.37 - return ContiguousSpaceDCTOC::get_actual_top(top, top_obj);
1.38 - }
1.39 -
1.40 // Walk the given memory region from bottom to (actual) top
1.41 // looking for objects and applying the oop closure (_cl) to
1.42 // them. The base implementation of this treats the area as
1.43 // blocks, where a block may or may not be an object. Sub-
1.44 // classes should override this to provide more accurate
1.45 // or possibly more efficient walking.
1.46 - void walk_mem_region(MemRegion mr, HeapWord* bottom, HeapWord* top) {
1.47 - Filtering_DCTOC::walk_mem_region(mr, bottom, top);
1.48 - }
1.49 + void walk_mem_region(MemRegion mr, HeapWord* bottom, HeapWord* top);
1.50
1.51 public:
1.52 HeapRegionDCTOC(G1CollectedHeap* g1,
