src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp

rev 2722 : 7095194: G1: HeapRegion::GrainBytes, GrainWords, and CardsPerRegion should be size_t
Summary: Declare GrainBytes, GrainWords, and CardsPerRegion as size_t.
Reviewed-by:

*** 146,156 ****
      if (loc_hr->is_in_reserved(from)) {
        size_t hw_offset = pointer_delta((HeapWord*)from, loc_hr->bottom());
        CardIdx_t from_card = (CardIdx_t)
            hw_offset >> (CardTableModRefBS::card_shift - LogHeapWordSize);
  
!       assert(0 <= from_card && from_card < HeapRegion::CardsPerRegion,
               "Must be in range.");
        add_card_work(from_card, par);
      }
    }
  
--- 146,156 ----
      if (loc_hr->is_in_reserved(from)) {
        size_t hw_offset = pointer_delta((HeapWord*)from, loc_hr->bottom());
        CardIdx_t from_card = (CardIdx_t)
            hw_offset >> (CardTableModRefBS::card_shift - LogHeapWordSize);
  
!       assert(0 <= from_card && (size_t)from_card < HeapRegion::CardsPerRegion,
               "Must be in range.");
        add_card_work(from_card, par);
      }
    }
  
*** 637,647 ****
  
        uintptr_t from_hr_bot_card_index =
          uintptr_t(from_hr->bottom())
            >> CardTableModRefBS::card_shift;
        CardIdx_t card_index = from_card - from_hr_bot_card_index;
!       assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
               "Must be in range.");
        if (G1HRRSUseSparseTable &&
            _sparse_table.add_card(from_hrs_ind, card_index)) {
          if (G1RecordHRRSOops) {
            HeapRegionRemSet::record(hr(), from);
--- 637,647 ----
  
        uintptr_t from_hr_bot_card_index =
          uintptr_t(from_hr->bottom())
            >> CardTableModRefBS::card_shift;
        CardIdx_t card_index = from_card - from_hr_bot_card_index;
!       assert(0 <= card_index && (size_t)card_index < HeapRegion::CardsPerRegion,
               "Must be in range.");
        if (G1HRRSUseSparseTable &&
            _sparse_table.add_card(from_hrs_ind, card_index)) {
          if (G1RecordHRRSOops) {
            HeapRegionRemSet::record(hr(), from);
*** 1064,1074 ****
        (uintptr_t(from) >> CardTableModRefBS::card_shift);
      uintptr_t hr_bot_card_index =
        uintptr_t(hr->bottom()) >> CardTableModRefBS::card_shift;
      assert(from_card >= hr_bot_card_index, "Inv");
      CardIdx_t card_index = from_card - hr_bot_card_index;
!     assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
             "Must be in range.");
      return _sparse_table.contains_card(hr_ind, card_index);
    }
  
  
--- 1064,1074 ----
        (uintptr_t(from) >> CardTableModRefBS::card_shift);
      uintptr_t hr_bot_card_index =
        uintptr_t(hr->bottom()) >> CardTableModRefBS::card_shift;
      assert(from_card >= hr_bot_card_index, "Inv");
      CardIdx_t card_index = from_card - hr_bot_card_index;
!     assert(0 <= card_index && (size_t)card_index < HeapRegion::CardsPerRegion,
             "Must be in range.");
      return _sparse_table.contains_card(hr_ind, card_index);
    }
  
  
*** 1189,1199 ****
    _bosa = _hrrs->bosa();
  
    _is = Sparse;
    // Set these values so that we increment to the first region.
    _coarse_cur_region_index = -1;
!   _coarse_cur_region_cur_card = (HeapRegion::CardsPerRegion-1);;
  
    _cur_region_cur_card = 0;
  
    _fine_array_index = -1;
    _fine_cur_prt = NULL;
--- 1189,1199 ----
    _bosa = _hrrs->bosa();
  
    _is = Sparse;
    // Set these values so that we increment to the first region.
    _coarse_cur_region_index = -1;
!   _coarse_cur_region_cur_card = (HeapRegion::CardsPerRegion-1);
  
    _cur_region_cur_card = 0;
  
    _fine_array_index = -1;
    _fine_cur_prt = NULL;
*** 1268,1278 ****
  }
  
  bool HeapRegionRemSetIterator::fine_has_next() {
    return
      _fine_cur_prt != NULL &&
!     _cur_region_cur_card < (size_t) HeapRegion::CardsPerRegion;
  }
  
  bool HeapRegionRemSetIterator::has_next(size_t& card_index) {
    switch (_is) {
    case Sparse:
--- 1268,1278 ----
  }
  
  bool HeapRegionRemSetIterator::fine_has_next() {
    return
      _fine_cur_prt != NULL &&
!     _cur_region_cur_card < HeapRegion::CardsPerRegion;
  }
  
  bool HeapRegionRemSetIterator::has_next(size_t& card_index) {
    switch (_is) {
    case Sparse: