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

rev 48820 : [mq]: 8196602-heapregionclosure-renaming

*** 271,281 ****
  class VerifyArchivePointerRegionClosure: public HeapRegionClosure {
  private:
    G1CollectedHeap* _g1h;
  public:
    VerifyArchivePointerRegionClosure(G1CollectedHeap* g1h) { }
!   virtual bool doHeapRegion(HeapRegion* r) {
     if (r->is_archive()) {
        VerifyObjectInArchiveRegionClosure verify_oop_pointers(r, false);
        r->object_iterate(&verify_oop_pointers);
      }
      return false;
--- 271,281 ----
  class VerifyArchivePointerRegionClosure: public HeapRegionClosure {
  private:
    G1CollectedHeap* _g1h;
  public:
    VerifyArchivePointerRegionClosure(G1CollectedHeap* g1h) { }
!   virtual bool do_heap_region(HeapRegion* r) {
     if (r->is_archive()) {
        VerifyObjectInArchiveRegionClosure verify_oop_pointers(r, false);
        r->object_iterate(&verify_oop_pointers);
      }
      return false;
*** 304,314 ****
  
    bool failures() {
      return _failures;
    }
  
!   bool doHeapRegion(HeapRegion* r) {
      // For archive regions, verify there are no heap pointers to
      // non-pinned regions. For all others, verify liveness info.
      if (r->is_closed_archive()) {
        VerifyObjectInArchiveRegionClosure verify_oop_pointers(r, false);
        r->object_iterate(&verify_oop_pointers);
--- 304,314 ----
  
    bool failures() {
      return _failures;
    }
  
!   bool do_heap_region(HeapRegion* r) {
      // For archive regions, verify there are no heap pointers to
      // non-pinned regions. For all others, verify liveness info.
      if (r->is_closed_archive()) {
        VerifyObjectInArchiveRegionClosure verify_oop_pointers(r, false);
        r->object_iterate(&verify_oop_pointers);
*** 496,506 ****
                             HeapRegionSet* humongous_set,
                             HeapRegionManager* hrm) :
      _old_set(old_set), _humongous_set(humongous_set), _hrm(hrm),
      _old_count(), _humongous_count(), _free_count(){ }
  
!   bool doHeapRegion(HeapRegion* hr) {
      if (hr->is_young()) {
        // TODO
      } else if (hr->is_humongous()) {
        assert(hr->containing_set() == _humongous_set, "Heap region %u is humongous but not in humongous set.", hr->hrm_index());
        _humongous_count++;
--- 496,506 ----
                             HeapRegionSet* humongous_set,
                             HeapRegionManager* hrm) :
      _old_set(old_set), _humongous_set(humongous_set), _hrm(hrm),
      _old_count(), _humongous_count(), _free_count(){ }
  
!   bool do_heap_region(HeapRegion* hr) {
      if (hr->is_young()) {
        // TODO
      } else if (hr->is_humongous()) {
        assert(hr->containing_set() == _humongous_set, "Heap region %u is humongous but not in humongous set.", hr->hrm_index());
        _humongous_count++;
*** 606,616 ****
    G1HeapVerifier* _verifier;
    G1SATBCardTableModRefBS* _ct_bs;
  public:
    G1VerifyCardTableCleanup(G1HeapVerifier* verifier, G1SATBCardTableModRefBS* ct_bs)
      : _verifier(verifier), _ct_bs(ct_bs) { }
!   virtual bool doHeapRegion(HeapRegion* r) {
      if (r->is_survivor()) {
        _verifier->verify_dirty_region(r);
      } else {
        _verifier->verify_not_dirty_region(r);
      }
--- 606,616 ----
    G1HeapVerifier* _verifier;
    G1SATBCardTableModRefBS* _ct_bs;
  public:
    G1VerifyCardTableCleanup(G1HeapVerifier* verifier, G1SATBCardTableModRefBS* ct_bs)
      : _verifier(verifier), _ct_bs(ct_bs) { }
!   virtual bool do_heap_region(HeapRegion* r) {
      if (r->is_survivor()) {
        _verifier->verify_dirty_region(r);
      } else {
        _verifier->verify_not_dirty_region(r);
      }
*** 652,662 ****
  class G1VerifyDirtyYoungListClosure : public HeapRegionClosure {
  private:
    G1HeapVerifier* _verifier;
  public:
    G1VerifyDirtyYoungListClosure(G1HeapVerifier* verifier) : HeapRegionClosure(), _verifier(verifier) { }
!   virtual bool doHeapRegion(HeapRegion* r) {
      _verifier->verify_dirty_region(r);
      return false;
    }
  };
  
--- 652,662 ----
  class G1VerifyDirtyYoungListClosure : public HeapRegionClosure {
  private:
    G1HeapVerifier* _verifier;
  public:
    G1VerifyDirtyYoungListClosure(G1HeapVerifier* verifier) : HeapRegionClosure(), _verifier(verifier) { }
!   virtual bool do_heap_region(HeapRegion* r) {
      _verifier->verify_dirty_region(r);
      return false;
    }
  };
  
*** 719,729 ****
    G1VerifyBitmapClosure(const char* caller, G1HeapVerifier* verifier) :
      _caller(caller), _verifier(verifier), _failures(false) { }
  
    bool failures() { return _failures; }
  
!   virtual bool doHeapRegion(HeapRegion* hr) {
      bool result = _verifier->verify_bitmaps(_caller, hr);
      if (!result) {
        _failures = true;
      }
      return false;
--- 719,729 ----
    G1VerifyBitmapClosure(const char* caller, G1HeapVerifier* verifier) :
      _caller(caller), _verifier(verifier), _failures(false) { }
  
    bool failures() { return _failures; }
  
!   virtual bool do_heap_region(HeapRegion* hr) {
      bool result = _verifier->verify_bitmaps(_caller, hr);
      if (!result) {
        _failures = true;
      }
      return false;
*** 742,752 ****
   private:
    bool _failures;
   public:
    G1CheckCSetFastTableClosure() : HeapRegionClosure(), _failures(false) { }
  
!   virtual bool doHeapRegion(HeapRegion* hr) {
      uint i = hr->hrm_index();
      InCSetState cset_state = (InCSetState) G1CollectedHeap::heap()->_in_cset_fast_test.get_by_index(i);
      if (hr->is_humongous()) {
        if (hr->in_collection_set()) {
          log_error(gc, verify)("## humongous region %u in CSet", i);
--- 742,752 ----
   private:
    bool _failures;
   public:
    G1CheckCSetFastTableClosure() : HeapRegionClosure(), _failures(false) { }
  
!   virtual bool do_heap_region(HeapRegion* hr) {
      uint i = hr->hrm_index();
      InCSetState cset_state = (InCSetState) G1CollectedHeap::heap()->_in_cset_fast_test.get_by_index(i);
      if (hr->is_humongous()) {
        if (hr->in_collection_set()) {
          log_error(gc, verify)("## humongous region %u in CSet", i);