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

rev 7525 : [mq]: noremset

*** 1884,1900 ****
    ReservedSpace heap_rs = Universe::reserve_heap(max_byte_size,
                                                   heap_alignment);
  
    initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
  
!   // Create the gen rem set (and barrier set) for the entire reserved region.
!   _rem_set = collector_policy()->create_rem_set(reserved_region());
!   set_barrier_set(rem_set()->bs());
!   if (!barrier_set()->is_a(BarrierSet::G1SATBCTLogging)) {
!     vm_exit_during_initialization("G1 requires a G1SATBLoggingCardTableModRefBS");
!     return JNI_ENOMEM;
!   }
  
    // Also create a G1 rem set.
    _g1_rem_set = new G1RemSet(this, g1_barrier_set());
  
    // Carve out the G1 part of the heap.
--- 1884,1899 ----
    ReservedSpace heap_rs = Universe::reserve_heap(max_byte_size,
                                                   heap_alignment);
  
    initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
  
!   // Create the barrier set for the entire reserved region.
!   G1SATBCardTableLoggingModRefBS* bs
!     = new G1SATBCardTableLoggingModRefBS(reserved_region());
!   bs->initialize();
!   assert(bs->is_a(BarrierSet::G1SATBCTLogging), "sanity");
!   set_barrier_set(bs);
  
    // Also create a G1 rem set.
    _g1_rem_set = new G1RemSet(this, g1_barrier_set());
  
    // Carve out the G1 part of the heap.
*** 3151,3162 ****
        heap_region_iterate(&blk);
        if (blk.failures()) {
          failures = true;
        }
      }
-     if (!silent) gclog_or_tty->print("RemSet ");
-     rem_set()->verify();
  
      if (G1StringDedup::is_enabled()) {
        if (!silent) gclog_or_tty->print("StrDedup ");
        G1StringDedup::verify();
      }
--- 3150,3159 ----
*** 5638,5649 ****
  
    G1ParTask g1_par_task(this, _task_queues);
  
    init_for_evac_failure(NULL);
  
-   rem_set()->prepare_for_younger_refs_iterate(true);
- 
    assert(dirty_card_queue_set().completed_buffers_num() == 0, "Should be empty");
    double start_par_time_sec = os::elapsedTime();
    double end_par_time_sec;
  
    {
--- 5635,5644 ----