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

rev 56992 : imported patch 8227739-merge-scan-rs-update-rs-cost
rev 56999 : imported patch 8233998-new-young-regions-registered-too-early
rev 57000 : imported patch 8233919-incrementally-calc-num-occupied
rev 57002 : imported patch 8233588-cleanup-survrategroup
rev 57003 : [mq]: 8233588-kbarrett-review
rev 57004 : imported patch 8231579-incremental-calculation-wrong
rev 57005 : [mq]: 8231579-sjohanss-review

@@ -243,14 +243,14 @@
          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;
   hr->set_recorded_rs_length(new_rs_length);
   _inc_recorded_rs_length_diff += rs_length_diff;
 
-  double old_elapsed_time_ms = hr->predicted_non_copy_time_ms();
-  double new_region_elapsed_time_ms = predict_region_non_copy_time_ms(hr);
-  double non_copy_time_ms_diff = new_region_elapsed_time_ms - old_elapsed_time_ms;
-  hr->set_predicted_non_copy_time_ms(new_region_elapsed_time_ms);
+  double old_non_copy_time = hr->predicted_non_copy_time_ms();
+  double new_non_copy_time = predict_region_non_copy_time_ms(hr);
+  double non_copy_time_ms_diff = new_non_copy_time - old_non_copy_time;
+  hr->set_predicted_non_copy_time_ms(new_non_copy_time);
   _inc_predicted_non_copy_time_ms_diff += non_copy_time_ms_diff;
 }
 
 void G1CollectionSet::add_young_region_common(HeapRegion* hr) {
   assert(hr->is_young(), "invariant");