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

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

*** 749,759 ****
        (int) _coarse_map->get_next_one_offset(_coarse_cur_region_index + 1);
      if ((size_t)_coarse_cur_region_index < _coarse_map->size()) {
        _coarse_cur_region_cur_card = 0;
        HeapWord* r_bot =
          _g1h->region_at((uint) _coarse_cur_region_index)->bottom();
!       _cur_region_card_offset = _bot->index_for(r_bot);
      } else {
        return false;
      }
    }
    // If we didn't return false above, then we can yield a card.
--- 749,759 ----
        (int) _coarse_map->get_next_one_offset(_coarse_cur_region_index + 1);
      if ((size_t)_coarse_cur_region_index < _coarse_map->size()) {
        _coarse_cur_region_cur_card = 0;
        HeapWord* r_bot =
          _g1h->region_at((uint) _coarse_cur_region_index)->bottom();
!       _cur_region_card_offset = _bot->index_for_raw(r_bot);
      } else {
        return false;
      }
    }
    // If we didn't return false above, then we can yield a card.
*** 790,800 ****
  void HeapRegionRemSetIterator::switch_to_prt(PerRegionTable* prt) {
    assert(prt != NULL, "Cannot switch to NULL prt");
    _fine_cur_prt = prt;
  
    HeapWord* r_bot = _fine_cur_prt->hr()->bottom();
!   _cur_region_card_offset = _bot->index_for(r_bot);
  
    // The bitmap scan for the PRT always scans from _cur_region_cur_card + 1.
    // To avoid special-casing this start case, and not miss the first bitmap
    // entry, initialize _cur_region_cur_card with -1 instead of 0.
    _cur_card_in_prt = (size_t)-1;
--- 790,800 ----
  void HeapRegionRemSetIterator::switch_to_prt(PerRegionTable* prt) {
    assert(prt != NULL, "Cannot switch to NULL prt");
    _fine_cur_prt = prt;
  
    HeapWord* r_bot = _fine_cur_prt->hr()->bottom();
!   _cur_region_card_offset = _bot->index_for_raw(r_bot);
  
    // The bitmap scan for the PRT always scans from _cur_region_cur_card + 1.
    // To avoid special-casing this start case, and not miss the first bitmap
    // entry, initialize _cur_region_cur_card with -1 instead of 0.
    _cur_card_in_prt = (size_t)-1;