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

rev 51979 : imported patch 8071913-almost-done
rev 51980 : [mq]: 8071913-alternate

*** 185,196 ****
  public:
    HeapRegionRemSet(G1BlockOffsetTable* bot, HeapRegion* hr);
  
    static void setup_remset_size();
  
    bool is_empty() const {
!     return (strong_code_roots_list_length() == 0) && _other_regions.is_empty();
    }
  
    bool occupancy_less_or_equal_than(size_t occ) const {
      return (strong_code_roots_list_length() == 0) && _other_regions.occupancy_less_or_equal_than(occ);
    }
--- 185,200 ----
  public:
    HeapRegionRemSet(G1BlockOffsetTable* bot, HeapRegion* hr);
  
    static void setup_remset_size();
  
+   bool cardset_is_empty() const {
+     return _other_regions.is_empty();
+   }
+ 
    bool is_empty() const {
!     return (strong_code_roots_list_length() == 0) && cardset_is_empty();
    }
  
    bool occupancy_less_or_equal_than(size_t occ) const {
      return (strong_code_roots_list_length() == 0) && _other_regions.occupancy_less_or_equal_than(occ);
    }
*** 351,361 ****
    static void test();
  #endif
  };
  
  class HeapRegionRemSetIterator : public StackObj {
!  private:
    // The region RSet over which we are iterating.
    HeapRegionRemSet* _hrrs;
  
    // Local caching of HRRS fields.
    const BitMap*             _coarse_map;
--- 355,365 ----
    static void test();
  #endif
  };
  
  class HeapRegionRemSetIterator : public StackObj {
! private:
    // The region RSet over which we are iterating.
    HeapRegionRemSet* _hrrs;
  
    // Local caching of HRRS fields.
    const BitMap*             _coarse_map;
*** 399,409 ****
    bool fine_has_next(size_t& card_index);
  
    // The Sparse remembered set iterator.
    SparsePRTIter _sparse_iter;
  
!  public:
    HeapRegionRemSetIterator(HeapRegionRemSet* hrrs);
  
    // If there remains one or more cards to be yielded, returns true and
    // sets "card_index" to one of those cards (which is then considered
    // yielded.)   Otherwise, returns false (and leaves "card_index"
--- 403,413 ----
    bool fine_has_next(size_t& card_index);
  
    // The Sparse remembered set iterator.
    SparsePRTIter _sparse_iter;
  
! public:
    HeapRegionRemSetIterator(HeapRegionRemSet* hrrs);
  
    // If there remains one or more cards to be yielded, returns true and
    // sets "card_index" to one of those cards (which is then considered
    // yielded.)   Otherwise, returns false (and leaves "card_index"