1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Fri Apr 29 12:40:49 2011 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Fri Apr 29 14:59:04 2011 -0400
1.3 @@ -584,6 +584,7 @@
1.4
1.5 // Reset HR stuff to default values.
1.6 void hr_clear(bool par, bool clear_space);
1.7 + void par_clear();
1.8
1.9 void initialize(MemRegion mr, bool clear_space, bool mangle_space);
1.10
1.11 @@ -802,12 +803,16 @@
1.12 HeapWord*
1.13 object_iterate_mem_careful(MemRegion mr, ObjectClosure* cl);
1.14
1.15 - // In this version - if filter_young is true and the region
1.16 - // is a young region then we skip the iteration.
1.17 + // filter_young: if true and the region is a young region then we
1.18 + // skip the iteration.
1.19 + // card_ptr: if not NULL, and we decide that the card is not young
1.20 + // and we iterate over it, we'll clean the card before we start the
1.21 + // iteration.
1.22 HeapWord*
1.23 oops_on_card_seq_iterate_careful(MemRegion mr,
1.24 FilterOutOfRegionClosure* cl,
1.25 - bool filter_young);
1.26 + bool filter_young,
1.27 + jbyte* card_ptr);
1.28
1.29 // A version of block start that is guaranteed to find *some* block
1.30 // boundary at or before "p", but does not object iteration, and may
