src/hotspot/share/gc/g1/heapRegion.inline.hpp

rev 57038 : imported patch 8233306-heapregion-sorting
rev 57051 : imported patch 8233588-cleanup-survrategroup
rev 57052 : imported patch 8233588-kbarrett-review
rev 57058 : imported patch 8234587-rename-g1survrategroup

@@ -376,11 +376,11 @@
   assert(has_valid_age_in_surv_rate(), "pre-condition");
   return _surv_rate_group->age_in_group(_age_index);
 }
 
 inline bool HeapRegion::has_valid_age_in_surv_rate() const {
-  return SurvRateGroup::is_valid_age_index(_age_index);
+  return G1SurvRateGroup::is_valid_age_index(_age_index);
 }
 
 inline bool HeapRegion::has_surv_rate_group() const {
   return _surv_rate_group != NULL;
 }

@@ -388,11 +388,11 @@
 inline double HeapRegion::surv_rate_prediction(G1Predictions const& predictor) const {
   assert(has_surv_rate_group(), "pre-condition");
   return _surv_rate_group->surv_rate_pred(predictor, age_in_surv_rate_group());
 }
 
-inline void HeapRegion::install_surv_rate_group(SurvRateGroup* surv_rate_group) {
+inline void HeapRegion::install_surv_rate_group(G1SurvRateGroup* surv_rate_group) {
   assert(surv_rate_group != NULL, "pre-condition");
   assert(!has_surv_rate_group(), "pre-condition");
   assert(is_young(), "pre-condition");
 
   _surv_rate_group = surv_rate_group;

@@ -403,11 +403,11 @@
   if (has_surv_rate_group()) {
     assert(has_valid_age_in_surv_rate(), "pre-condition");
     assert(is_young(), "pre-condition");
 
     _surv_rate_group = NULL;
-    _age_index = SurvRateGroup::InvalidAgeIndex;
+    _age_index = G1SurvRateGroup::InvalidAgeIndex;
   } else {
     assert(!has_valid_age_in_surv_rate(), "pre-condition");
   }
 }