src/hotspot/share/gc/g1/g1RemSet.cpp

rev 49520 : imported patch 8178105-switch-at-remark
rev 49524 : imported patch 8200426-g1h-refactoring

*** 503,519 ****
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);
  }
  
  inline void check_card_ptr(jbyte* card_ptr, G1CardTable* ct) {
  #ifdef ASSERT
!   G1CollectedHeap* g1 = G1CollectedHeap::heap();
!   assert(g1->is_in_exact(ct->addr_for(card_ptr)),
           "Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap",
           p2i(card_ptr),
           ct->index_for(ct->addr_for(card_ptr)),
           p2i(ct->addr_for(card_ptr)),
!          g1->addr_to_region(ct->addr_for(card_ptr)));
  #endif
  }
  
  void G1RemSet::refine_card_concurrently(jbyte* card_ptr,
                                          uint worker_i) {
--- 503,519 ----
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);
  }
  
  inline void check_card_ptr(jbyte* card_ptr, G1CardTable* ct) {
  #ifdef ASSERT
!   G1CollectedHeap* g1h = G1CollectedHeap::heap();
!   assert(g1h->is_in_exact(ct->addr_for(card_ptr)),
           "Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap",
           p2i(card_ptr),
           ct->index_for(ct->addr_for(card_ptr)),
           p2i(ct->addr_for(card_ptr)),
!          g1h->addr_to_region(ct->addr_for(card_ptr)));
  #endif
  }
  
  void G1RemSet::refine_card_concurrently(jbyte* card_ptr,
                                          uint worker_i) {