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

rev 53776 : imported patch 8219098-improve-heapregion-verification-failure-messages

*** 69,98 ****
          yy.cr();
          yy.print_cr("----------");
        }
        if (!_g1h->is_in_closed_subset(obj)) {
          HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
!         yy.print_cr("Field " PTR_FORMAT
!             " of live obj " PTR_FORMAT " in region "
!             "[" PTR_FORMAT ", " PTR_FORMAT ")",
!             p2i(p), p2i(_containing_obj),
!             p2i(from->bottom()), p2i(from->end()));
          print_object(&yy, _containing_obj);
          yy.print_cr("points to obj " PTR_FORMAT " not in the heap",
              p2i(obj));
        } else {
          HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
          HeapRegion* to   = _g1h->heap_region_containing((HeapWord*)obj);
!         yy.print_cr("Field " PTR_FORMAT
!             " of live obj " PTR_FORMAT " in region "
!             "[" PTR_FORMAT ", " PTR_FORMAT ")",
!             p2i(p), p2i(_containing_obj),
!             p2i(from->bottom()), p2i(from->end()));
          print_object(&yy, _containing_obj);
!         yy.print_cr("points to dead obj " PTR_FORMAT " in region "
!             "[" PTR_FORMAT ", " PTR_FORMAT ")",
!             p2i(obj), p2i(to->bottom()), p2i(to->end()));
          print_object(&yy, obj);
        }
        yy.print_cr("----------");
        yy.flush();
        _failures = true;
--- 69,91 ----
          yy.cr();
          yy.print_cr("----------");
        }
        if (!_g1h->is_in_closed_subset(obj)) {
          HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
!         yy.print_cr("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region " HR_FORMAT,
!                     p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
          print_object(&yy, _containing_obj);
          yy.print_cr("points to obj " PTR_FORMAT " not in the heap",
                      p2i(obj));
        } else {
          HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
          HeapRegion* to   = _g1h->heap_region_containing((HeapWord*)obj);
!         yy.print_cr("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region " HR_FORMAT,
!                     p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
          print_object(&yy, _containing_obj);
!         yy.print_cr("points to dead obj " PTR_FORMAT " in region " HR_FORMAT,
!                     p2i(obj), HR_FORMAT_PARAMS(to));
          print_object(&yy, obj);
        }
        yy.print_cr("----------");
        yy.flush();
        _failures = true;