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

*** 1743,1753 ****
    _dirty_card_queue_set(false),
    _is_alive_closure_cm(this),
    _is_alive_closure_stw(this),
    _ref_processor_cm(NULL),
    _ref_processor_stw(NULL),
!   _bot_shared(NULL),
    _cg1r(NULL),
    _g1mm(NULL),
    _refine_cte_cl(NULL),
    _secondary_free_list("Secondary Free List", new SecondaryFreeRegionListMtSafeChecker()),
    _old_set("Old Set", false /* humongous */, new OldRegionSetMtSafeChecker()),
--- 1743,1753 ----
    _dirty_card_queue_set(false),
    _is_alive_closure_cm(this),
    _is_alive_closure_stw(this),
    _ref_processor_cm(NULL),
    _ref_processor_stw(NULL),
!   _bot(NULL),
    _cg1r(NULL),
    _g1mm(NULL),
    _refine_cte_cl(NULL),
    _secondary_free_list("Secondary Free List", new SecondaryFreeRegionListMtSafeChecker()),
    _old_set("Old Set", false /* humongous */, new OldRegionSetMtSafeChecker()),
*** 1904,1915 ****
    heap_storage->set_mapping_changed_listener(&_listener);
  
    // Create storage for the BOT, card table, card counts table (hot card cache) and the bitmaps.
    G1RegionToSpaceMapper* bot_storage =
      create_aux_memory_mapper("Block offset table",
!                              G1BlockOffsetSharedArray::compute_size(g1_rs.size() / HeapWordSize),
!                              G1BlockOffsetSharedArray::heap_map_factor());
  
    ReservedSpace cardtable_rs(G1SATBCardTableLoggingModRefBS::compute_size(g1_rs.size() / HeapWordSize));
    G1RegionToSpaceMapper* cardtable_storage =
      create_aux_memory_mapper("Card table",
                               G1SATBCardTableLoggingModRefBS::compute_size(g1_rs.size() / HeapWordSize),
--- 1904,1915 ----
    heap_storage->set_mapping_changed_listener(&_listener);
  
    // Create storage for the BOT, card table, card counts table (hot card cache) and the bitmaps.
    G1RegionToSpaceMapper* bot_storage =
      create_aux_memory_mapper("Block offset table",
!                              G1BlockOffsetTable::compute_size(g1_rs.size() / HeapWordSize),
!                              G1BlockOffsetTable::heap_map_factor());
  
    ReservedSpace cardtable_rs(G1SATBCardTableLoggingModRefBS::compute_size(g1_rs.size() / HeapWordSize));
    G1RegionToSpaceMapper* cardtable_storage =
      create_aux_memory_mapper("Card table",
                               G1SATBCardTableLoggingModRefBS::compute_size(g1_rs.size() / HeapWordSize),
*** 1943,1953 ****
    guarantee(HeapRegion::CardsPerRegion < max_cards_per_region,
              "too many cards per region");
  
    FreeRegionList::set_unrealistically_long_length(max_regions() + 1);
  
!   _bot_shared = new G1BlockOffsetSharedArray(reserved_region(), bot_storage);
  
    {
      HeapWord* start = _hrm.reserved().start();
      HeapWord* end = _hrm.reserved().end();
      size_t granularity = HeapRegion::GrainBytes;
--- 1943,1953 ----
    guarantee(HeapRegion::CardsPerRegion < max_cards_per_region,
              "too many cards per region");
  
    FreeRegionList::set_unrealistically_long_length(max_regions() + 1);
  
!   _bot = new G1BlockOffsetTable(reserved_region(), bot_storage);
  
    {
      HeapWord* start = _hrm.reserved().start();
      HeapWord* end = _hrm.reserved().end();
      size_t granularity = HeapRegion::GrainBytes;