src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 49502 : imported patch 8199742-collectorstate-fixes
rev 49503 : [mq]: 8199742-stefanj-review
rev 49504 : imported patch 8151171-renamings
rev 49513 : [mq]: 8200385-prev-bitmap-marks-left

*** 4689,4699 ****
                               next_bitmap->is_marked(r->bottom()),
                               g1h->is_humongous_reclaim_candidate(region_idx),
                               obj->is_typeArray()
                              );
  
!     g1h->concurrent_mark()->humongous_object_eagerly_reclaimed(r);
      _humongous_objects_reclaimed++;
      do {
        HeapRegion* next = g1h->next_region_in_humongous(r);
        _freed_bytes += r->used();
        r->set_containing_set(NULL);
--- 4689,4705 ----
                               next_bitmap->is_marked(r->bottom()),
                               g1h->is_humongous_reclaim_candidate(region_idx),
                               obj->is_typeArray()
                              );
  
!     G1ConcurrentMark* const cm = g1h->concurrent_mark();
!     cm->humongous_object_eagerly_reclaimed(r);
!     assert(!cm->is_marked_in_prev_bitmap(obj) && !cm->is_marked_in_next_bitmap(obj),
!            "Eagerly reclaimed humongous region %u should not be marked at all but is in prev %s next %s",
!            region_idx,
!            BOOL_TO_STR(cm->is_marked_in_prev_bitmap(obj)),
!            BOOL_TO_STR(cm->is_marked_in_next_bitmap(obj)));
      _humongous_objects_reclaimed++;
      do {
        HeapRegion* next = g1h->next_region_in_humongous(r);
        _freed_bytes += r->used();
        r->set_containing_set(NULL);