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

rev 57101 : [mq]: 8227739-merge-scan-rs-update-rs-cost
rev 57104 : imported patch 8233998-new-young-regions-registered-too-early
rev 57105 : [mq]: 8233919-incrementally-calc-num-occupied
rev 57107 : [mq]: 8233919-sangheki-review

*** 246,256 ****
    // separate fields (*_diff) and we'll just add them to the "main"
    // fields at the start of a GC.
  
    size_t old_rs_length = hr->recorded_rs_length();
    assert(old_rs_length <= new_rs_length,
!          "Remembered set sizes must increase (changed from " SIZE_FORMAT " to " SIZE_FORMAT " region %u type %s)",
           old_rs_length, new_rs_length, hr->hrm_index(), hr->get_short_type_str());
    size_t rs_length_diff = new_rs_length - old_rs_length;
    _inc_recorded_rs_length_diff += rs_length_diff;
  
    double old_elapsed_time_ms = hr->predicted_elapsed_time_ms();
--- 246,256 ----
    // separate fields (*_diff) and we'll just add them to the "main"
    // fields at the start of a GC.
  
    size_t old_rs_length = hr->recorded_rs_length();
    assert(old_rs_length <= new_rs_length,
!          "Remembered set decreased (changed from " SIZE_FORMAT " to " SIZE_FORMAT " region %u type %s)",
           old_rs_length, new_rs_length, hr->hrm_index(), hr->get_short_type_str());
    size_t rs_length_diff = new_rs_length - old_rs_length;
    _inc_recorded_rs_length_diff += rs_length_diff;
  
    double old_elapsed_time_ms = hr->predicted_elapsed_time_ms();