1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Mon Jul 21 09:59:37 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Mon Jul 21 09:59:46 2014 +0200
1.3 @@ -275,9 +275,13 @@
1.4
1.5 // We now want to allow clearing of the marking bitmap to be
1.6 // suspended by a collection pause.
1.7 - {
1.8 + // We may have aborted just before the remark. Do not bother clearing the
1.9 + // bitmap then, as it has been done during mark abort.
1.10 + if (!cm()->has_aborted()) {
1.11 SuspendibleThreadSetJoiner sts;
1.12 _cm->clearNextBitmap();
1.13 + } else {
1.14 + assert(!G1VerifyBitmaps || _cm->nextMarkBitmapIsClear(), "Next mark bitmap must be clear");
1.15 }
1.16 }
1.17
