--- old/src/share/vm/gc/g1/g1HeapVerifier.cpp 2017-08-08 17:40:32.435627061 -0400 +++ new/src/share/vm/gc/g1/g1HeapVerifier.cpp 2017-08-08 17:40:31.063549086 -0400 @@ -60,8 +60,7 @@ T heap_oop = oopDesc::load_heap_oop(p); if (!oopDesc::is_null(heap_oop)) { oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); - HeapRegion* hr = _g1h->heap_region_containing(obj); - if (_g1h->is_obj_dead_cond(obj, _vo) && !hr->is_archive()) { + if (_g1h->is_obj_dead_cond(obj, _vo)) { Log(gc, verify) log; log.info("Root location " PTR_FORMAT " points to dead obj " PTR_FORMAT, p2i(p), p2i(obj)); if (_vo == VerifyOption_G1UseMarkWord) { @@ -236,20 +235,14 @@ class VerifyArchiveOopClosure: public OopClosure { HeapRegion* _hr; - bool _verbose; public: - VerifyArchiveOopClosure(HeapRegion *hr, bool verbose) - : _hr(hr), _verbose(verbose) { } + VerifyArchiveOopClosure(HeapRegion *hr) + : _hr(hr) { } void do_oop(narrowOop *p) { do_oop_work(p); } void do_oop( oop *p) { do_oop_work(p); } template void do_oop_work(T *p) { oop obj = oopDesc::load_decode_heap_oop(p); - if (_verbose) { - if (obj != NULL) { - obj->print(); - } - } if (_hr->is_open_archive()) { guarantee(obj == NULL || G1ArchiveAllocator::is_archive_object(obj), @@ -266,17 +259,12 @@ class VerifyObjectInArchiveRegionClosure: public ObjectClosure { HeapRegion* _hr; - bool _verbose; public: VerifyObjectInArchiveRegionClosure(HeapRegion *hr, bool verbose) - : _hr(hr), _verbose(verbose) { } + : _hr(hr) { } // Verify that all object pointers are to archive regions. void do_object(oop o) { - if (_verbose) { - o->print(); - } - - VerifyArchiveOopClosure checkOop(_hr, _verbose); + VerifyArchiveOopClosure checkOop(_hr); assert(o != NULL, "Should not be here for NULL oops"); o->oop_iterate_no_header(&checkOop); }