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

rev 49517 : imported patch 8200305-gc,liveness-output
rev 49524 : imported patch 8200426-g1h-refactoring

*** 886,897 ****
    // Now, does iteration yield these three?
    HeapRegionRemSetIterator iter(hrrs);
    size_t sum = 0;
    size_t card_index;
    while (iter.has_next(card_index)) {
!     HeapWord* card_start =
!       G1CollectedHeap::heap()->bot()->address_for_index(card_index);
      tty->print_cr("  Card " PTR_FORMAT ".", p2i(card_start));
      sum++;
    }
    guarantee(sum == 11 - 3 + 2048, "Failure");
    guarantee(sum == hrrs->occupied(), "Failure");
--- 886,896 ----
    // Now, does iteration yield these three?
    HeapRegionRemSetIterator iter(hrrs);
    size_t sum = 0;
    size_t card_index;
    while (iter.has_next(card_index)) {
!     HeapWord* card_start = g1h->bot()->address_for_index(card_index);
      tty->print_cr("  Card " PTR_FORMAT ".", p2i(card_start));
      sum++;
    }
    guarantee(sum == 11 - 3 + 2048, "Failure");
    guarantee(sum == hrrs->occupied(), "Failure");