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

rev 8069 : imported patch g1_cleanup

*** 204,214 ****
    comb = comb >> HeapRegion::LogOfHRGrainBytes;
    if (comb == 0) return;
    if (new_val == NULL) return;
    // Otherwise, log it.
    G1SATBCardTableLoggingModRefBS* g1_bs =
!     barrier_set_cast<G1SATBCardTableLoggingModRefBS>(Universe::heap()->barrier_set());
    g1_bs->write_ref_field_work(field, new_val);
  }
  
  void
  G1SATBCardTableLoggingModRefBS::invalidate(MemRegion mr, bool whole_heap) {
--- 204,214 ----
    comb = comb >> HeapRegion::LogOfHRGrainBytes;
    if (comb == 0) return;
    if (new_val == NULL) return;
    // Otherwise, log it.
    G1SATBCardTableLoggingModRefBS* g1_bs =
!     barrier_set_cast<G1SATBCardTableLoggingModRefBS>(G1CollectedHeap::heap()->barrier_set());
    g1_bs->write_ref_field_work(field, new_val);
  }
  
  void
  G1SATBCardTableLoggingModRefBS::invalidate(MemRegion mr, bool whole_heap) {