1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Fri Aug 19 14:22:25 2011 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Fri Aug 19 09:30:59 2011 +0200
1.3 @@ -1263,16 +1263,10 @@
1.4 // in the young gen: for the SATB pre-barrier, there is no
1.5 // pre-value that needs to be remembered; for the remembered-set
1.6 // update logging post-barrier, we don't maintain remembered set
1.7 - // information for young gen objects. Note that non-generational
1.8 - // G1 does not have any "young" objects, should not elide
1.9 - // the rs logging barrier and so should always answer false below.
1.10 - // However, non-generational G1 (-XX:-G1Gen) appears to have
1.11 - // bit-rotted so was not tested below.
1.12 + // information for young gen objects.
1.13 virtual bool can_elide_initializing_store_barrier(oop new_obj) {
1.14 // Re 6920090, 6920109 above.
1.15 assert(ReduceInitialCardMarksForG1, "Else cannot be here");
1.16 - assert(G1Gen || !is_in_young(new_obj),
1.17 - "Non-generational G1 should never return true below");
1.18 return is_in_young(new_obj);
1.19 }
1.20
1.21 @@ -1389,9 +1383,6 @@
1.22 // bitmap off to the side.
1.23 void doConcurrentMark();
1.24
1.25 - // Do a full concurrent marking, synchronously.
1.26 - void do_sync_mark();
1.27 -
1.28 bool isMarkedPrev(oop obj) const;
1.29 bool isMarkedNext(oop obj) const;
1.30
