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

Print this page
rev 6802 : imported patch refactor-heapregionseq
rev 6803 : imported patch bengt-review-1
rev 6805 : imported patch commit-uncommit-within-heap
rev 6806 : imported patch mikael-suggestions
rev 6807 : imported patch bengt-suggestions
rev 6808 : imported patch mikael-review-2

@@ -2001,11 +2001,10 @@
     G1RegionToSpaceMapper::create_mapper(cardtable_rs,
                                          os::vm_page_size(),
                                          HeapRegion::GrainBytes,
                                          G1BlockOffsetSharedArray::N_bytes,
                                          mtGC);
-  g1_barrier_set()->initialize(cardtable_storage);
   
   // Reserve space for the card counts table.
   ReservedSpace card_counts_rs(G1BlockOffsetSharedArray::compute_size(g1_rs.size() / HeapWordSize));
   G1RegionToSpaceMapper* card_counts_storage =
     G1RegionToSpaceMapper::create_mapper(card_counts_rs,

@@ -2032,11 +2031,11 @@
                                          HeapRegion::GrainBytes,
                                          CMBitMap::mark_distance(),
                                          mtGC);
 
   _hrs.initialize(heap_storage, prev_bitmap_storage, next_bitmap_storage, bot_storage, cardtable_storage, card_counts_storage);
- 
+  g1_barrier_set()->initialize(cardtable_storage);
    // Do later initialization work for concurrent refinement.
   _cg1r->init(card_counts_storage);
 
   // 6843694 - ensure that the maximum region index can fit
   // in the remembered set structures.