1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Apr 01 07:46:51 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Aug 19 12:39:06 2014 +0200
1.3 @@ -2800,7 +2800,6 @@
1.4 str = " O";
1.5 } else {
1.6 HeapRegion* hr = _g1h->heap_region_containing(obj);
1.7 - guarantee(hr != NULL, "invariant");
1.8 bool over_tams = _g1h->allocated_since_marking(obj, hr, _vo);
1.9 bool marked = _g1h->is_marked(obj, _vo);
1.10
1.11 @@ -3565,9 +3564,8 @@
1.12 }
1.13
1.14 void CMTask::setup_for_region(HeapRegion* hr) {
1.15 - // Separated the asserts so that we know which one fires.
1.16 assert(hr != NULL,
1.17 - "claim_region() should have filtered out continues humongous regions");
1.18 + "claim_region() should have filtered out NULL regions");
1.19 assert(!hr->continuesHumongous(),
1.20 "claim_region() should have filtered out continues humongous regions");
1.21
