src/share/vm/gc/g1/heapRegion.cpp

rev 13288 : imported patch 8181917-refactor-ul-logstream
rev 13289 : [mq]: 8181917-refactor-ul-logstream-delta

*** 526,545 ****
          ResourceMark rm;
          if (!_g1h->is_in_closed_subset(obj)) {
            HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
            log.error("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()));
-           // Unconditional write?
            LogStream ls(log.error());
            print_object(&ls, _containing_obj);
            log.error("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);
            log.error("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()));
-           // Unconditional write?
            LogStream ls(log.error());
            print_object(&ls, _containing_obj);
            log.error("points to dead obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")",
              p2i(obj), p2i(to->bottom()), p2i(to->end()));
            print_object(&ls, obj);
--- 526,543 ----
*** 596,606 ****
            }
            log.error("Missing rem set entry:");
            log.error("Field " PTR_FORMAT " of obj " PTR_FORMAT ", in region " HR_FORMAT,
              p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
            ResourceMark rm;
-           // Unconditional write?
            LogStream ls(log.error());
            _containing_obj->print_on(&ls);
            log.error("points to obj " PTR_FORMAT " in region " HR_FORMAT, p2i(obj), HR_FORMAT_PARAMS(to));
            if (obj->is_oop()) {
              obj->print_on(&ls);
--- 594,603 ----