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

rev 56942 : imported patch 8227739-merge-scan-rs-update-rs-cost
rev 56949 : imported patch 8233998-new-young-regions-registered-too-early
rev 56950 : imported patch 8233919-incrementally-calc-num-occupied
rev 56952 : [mq]: 8233588-cleanup-survrategroup

@@ -333,14 +333,12 @@
   G1VerifyYoungAgesClosure() : HeapRegionClosure(), _valid(true) { }
 
   virtual bool do_heap_region(HeapRegion* r) {
     guarantee(r->is_young(), "Region must be young but is %s", r->get_type_str());
 
-    SurvRateGroup* group = r->surv_rate_group();
-
-    if (group == NULL) {
-      log_error(gc, verify)("## encountered NULL surv_rate_group in young region");
+    if (!r->has_surv_rate_group()) {
+      log_error(gc, verify)("## encountered young region without surv_rate_group");
       _valid = false;
     }
 
     if (r->age_in_surv_rate_group() < 0) {
       log_error(gc, verify)("## encountered negative age in young region");

@@ -376,11 +374,11 @@
     assert(r->in_collection_set(), "Region %u should be in collection set", r->hrm_index());
     _st->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
                   HR_FORMAT_PARAMS(r),
                   p2i(r->prev_top_at_mark_start()),
                   p2i(r->next_top_at_mark_start()),
-                  r->age_in_surv_rate_group_cond());
+                  r->has_surv_rate_group() ? r->age_in_surv_rate_group() : -1);
     return false;
   }
 };
 
 void G1CollectionSet::print(outputStream* st) {