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