1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Oct 06 13:28:09 2011 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Wed Sep 28 08:21:30 2011 +0200
1.3 @@ -1337,12 +1337,7 @@
1.4 // storage in the heap comes from a young region or not.
1.5 // See ReduceInitialCardMarks.
1.6 virtual bool can_elide_tlab_store_barriers() const {
1.7 - // 6920090: Temporarily disabled, because of lingering
1.8 - // instabilities related to RICM with G1. In the
1.9 - // interim, the option ReduceInitialCardMarksForG1
1.10 - // below is left solely as a debugging device at least
1.11 - // until 6920109 fixes the instabilities.
1.12 - return ReduceInitialCardMarksForG1;
1.13 + return true;
1.14 }
1.15
1.16 virtual bool card_mark_must_follow_store() const {
1.17 @@ -1366,8 +1361,6 @@
1.18 // update logging post-barrier, we don't maintain remembered set
1.19 // information for young gen objects.
1.20 virtual bool can_elide_initializing_store_barrier(oop new_obj) {
1.21 - // Re 6920090, 6920109 above.
1.22 - assert(ReduceInitialCardMarksForG1, "Else cannot be here");
1.23 return is_in_young(new_obj);
1.24 }
1.25
