src/share/vm/gc/g1/g1CollectedHeap.cpp

rev 9773 : imported patch 8145672-remove-dependency-of-g1fromcardcache-to-heapregionremset
rev 9774 : [mq]: 8145672-jmasa-comments

*** 1934,1944 ****
    // 6843694 - ensure that the maximum region index can fit
    // in the remembered set structures.
    const uint max_region_idx = (1U << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1;
    guarantee((max_regions() - 1) <= max_region_idx, "too many regions");
  
!   G1RemSet::init_heap(max_regions());
  
    size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
    guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized");
    guarantee(HeapRegion::CardsPerRegion < max_cards_per_region,
              "too many cards per region");
--- 1934,1944 ----
    // 6843694 - ensure that the maximum region index can fit
    // in the remembered set structures.
    const uint max_region_idx = (1U << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1;
    guarantee((max_regions() - 1) <= max_region_idx, "too many regions");
  
!   G1RemSet::initialize(max_regions());
  
    size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
    guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized");
    guarantee(HeapRegion::CardsPerRegion < max_cards_per_region,
              "too many cards per region");