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

rev 53924 : imported patch 8219747-remove-g1-prefix
rev 53926 : imported patch 8219748-add-and-use-timing-object

*** 529,539 ****
  
    _scan_state->reset();
  }
  
  void G1RemSet::cleanup_after_oops_into_collection_set_do() {
!   G1GCPhaseTimes* phase_times = _g1h->policy()->phase_times();
  
    // Set all cards back to clean.
    double start = os::elapsedTime();
    _scan_state->clear_card_table(_g1h->workers());
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);
--- 529,539 ----
  
    _scan_state->reset();
  }
  
  void G1RemSet::cleanup_after_oops_into_collection_set_do() {
!   G1GCPhaseTimes* phase_times = _g1h->phase_times();
  
    // Set all cards back to clean.
    double start = os::elapsedTime();
    _scan_state->clear_card_table(_g1h->workers());
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);