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

*** 1852,1863 ****
    // Create the barrier set for the entire reserved region.
    G1SATBCardTableLoggingModRefBS* bs
      = new G1SATBCardTableLoggingModRefBS(reserved_region());
    bs->initialize();
    assert(bs->is_a(BarrierSet::G1SATBCTLogging), "sanity");
!   _barrier_set = bs;
!   oopDesc::set_bs(bs);
  
    // Also create a G1 rem set.
    _g1_rem_set = new G1RemSet(this, g1_barrier_set());
  
    // Carve out the G1 part of the heap.
--- 1852,1862 ----
    // 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.