8302760: Improve liveness/remembered set verification for G1

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

@@ -367,9 +367,7 @@ class VerifyRegionClosure: public HeapRegionClosure {
          _failures = true;
       }
     } else {
-      bool failures = false;
-      r->verify(_vo, &failures);
-      if (failures) {
+      if (r->verify(_vo)) {
         _failures = true;
       } else if (!r->is_starts_humongous()) {
         VerifyObjsInRegionClosure not_dead_yet_cl(r, _vo);

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

@@ -58,16 +58,3 @@ void G1CLDScanClosure::do_cld(ClassLoaderData* cld) {
   }
   _count++;
 }
-
-G1VerificationClosure::G1VerificationClosure(G1CollectedHeap* g1h, VerifyOption vo) :
-  _g1h(g1h), _containing_obj(nullptr), _num_failures(0), _vo(vo) { }
-
-void G1VerificationClosure::print_object(outputStream* out, oop obj) {
-#ifdef PRODUCT
-  Klass* k = obj->klass();
-  const char* class_name = k->external_name();
-  out->print_cr("class name %s", class_name);
-#else // PRODUCT
-  obj->print_on(out);
-#endif // PRODUCT
-}

src/hotspot/share/gc/g1/g1OopClosures.hpp

@@ -234,36 +234,4 @@ class G1RebuildRemSetClosure : public BasicOopIterateClosure {
   virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
 };
 
-class G1VerificationClosure : public BasicOopIterateClosure {
-protected:
-  G1CollectedHeap* _g1h;
-  oop _containing_obj;
-  size_t _num_failures;
-  VerifyOption _vo;
-
-public:
-  G1VerificationClosure(G1CollectedHeap* g1h, VerifyOption vo);
-
-  void set_containing_obj(oop obj) {
-    _containing_obj = obj;
-  }
-
-  bool has_failures() { return _num_failures != 0; }
-  size_t num_failures() { return _num_failures; }
-
-  void print_object(outputStream* out, oop obj);
-};
-
-class G1VerifyLiveClosure : public G1VerificationClosure {
-
-  template <class T>
-  inline void do_oop_work(T* p);
-
-public:
-  G1VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) : G1VerificationClosure(g1h, vo) {}
-
-  virtual void do_oop(narrowOop* p) { do_oop_work(p); }
-  virtual void do_oop(oop* p) { do_oop_work(p); }
-};
-
 #endif // SHARE_GC_G1_G1OOPCLOSURES_HPP

src/hotspot/share/gc/g1/g1OopClosures.inline.hpp

@@ -272,47 +272,4 @@ template <class T> void G1RebuildRemSetClosure::do_oop_work(T* p) {
   }
 }
 
-template <class T>
-inline void G1VerifyLiveClosure::do_oop_work(T* p) {
-  assert(_containing_obj != nullptr, "Precondition");
-  assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo), "Precondition");
-
-  T heap_oop = RawAccess<>::oop_load(p);
-  if (CompressedOops::is_null(heap_oop)) {
-    return;
-  }
-
-  ResourceMark rm;
-
-  Log(gc, verify) log;
-  LogStream ls(log.error());
-
-  oop obj = CompressedOops::decode_raw_not_null(heap_oop);
-  bool is_in_heap = _g1h->is_in(obj);
-
-  if (!is_in_heap || _g1h->is_obj_dead_cond(obj, _vo)) {
-    MutexLocker x(G1RareEvent_lock, Mutex::_no_safepoint_check_flag);
-
-    if (!has_failures()) {
-      log.error("----------");
-    }
-
-    HeapRegion* from = _g1h->heap_region_containing(p);
-    log.error("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region " HR_FORMAT,
-              p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
-    print_object(&ls, _containing_obj);
-
-    if (!is_in_heap) {
-      log.error("points to address " PTR_FORMAT " outside of heap", p2i(obj));
-    } else {
-      HeapRegion* to = _g1h->heap_region_containing(obj);
-      log.error("points to dead obj " PTR_FORMAT " in region " HR_FORMAT " remset %s",
-                p2i(obj), HR_FORMAT_PARAMS(to), to->rem_set()->get_state_str());
-      print_object(&ls, obj);
-    }
-    log.error("----------");
-    _num_failures++;
-  }
-}
-
 #endif // SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP