--- old/src/hotspot/share/gc/g1/heapRegion.inline.hpp	2019-11-19 15:50:34.256802241 +0100
+++ new/src/hotspot/share/gc/g1/heapRegion.inline.hpp	2019-11-19 15:50:34.048800952 +0100
@@ -373,10 +373,14 @@
 
 inline int HeapRegion::age_in_surv_rate_group() const {
   assert(has_surv_rate_group(), "pre-condition");
-  assert(SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
+  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);
+}
+
 inline bool HeapRegion::has_surv_rate_group() const {
   return _surv_rate_group != NULL;
 }
@@ -397,19 +401,19 @@
 
 inline void HeapRegion::uninstall_surv_rate_group() {
   if (has_surv_rate_group()) {
-    assert(SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
+    assert(has_valid_age_in_surv_rate(), "pre-condition");
     assert(is_young(), "pre-condition");
 
     _surv_rate_group = NULL;
     _age_index = SurvRateGroup::InvalidAgeIndex;
   } else {
-    assert(!SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
+    assert(!has_valid_age_in_surv_rate(), "pre-condition");
   }
 }
 
 inline void HeapRegion::record_surv_words_in_group(size_t words_survived) {
   assert(has_surv_rate_group(), "pre-condition");
-  assert(SurvRateGroup::is_valid_age_index(_age_index), "pre-condition");
+  assert(has_valid_age_in_surv_rate(), "pre-condition");
   int age_in_group = age_in_surv_rate_group();
   _surv_rate_group->record_surviving_words(age_in_group, words_survived);
 }