Move affiliation and mode out of ShenandoahGenerationalMode

Reviewed-by: kdnilsen, wkemper

Author: shipilev

src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp

@@ -96,7 +96,7 @@ void ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata(Shenand
   // more garbage.  This represents one of the reasons why we keep looking at regions even after we decide, for example,
   // to exclude one of the regions because it might require evacuation of too much live data.
   bool is_generational = heap->mode()->is_generational();
-  bool is_global = (_generation->generation_mode() == GLOBAL);
+  bool is_global = _generation->is_global();
   size_t capacity = heap->young_generation()->max_capacity();
 
   // cur_young_garbage represents the amount of memory to be reclaimed from young-gen.  In the case that live objects

src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp

@@ -101,7 +101,7 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
   bool is_generational = heap->mode()->is_generational();
 
   assert(collection_set->count() == 0, "Must be empty");
-  assert(_generation->generation_mode() != OLD, "Old GC invokes ShenandoahOldHeuristics::choose_collection_set()");
+  assert(!_generation->is_old(), "Old GC invokes ShenandoahOldHeuristics::choose_collection_set()");
 
   // Check all pinned regions have updated status before choosing the collection set.
   heap->assert_pinned_region_status();
@@ -141,7 +141,7 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
         immediate_garbage += garbage;
         region->make_trash_immediate();
       } else {
-        assert (_generation->generation_mode() != OLD, "OLD is handled elsewhere");
+        assert(!_generation->is_old(), "OLD is handled elsewhere");
         live_memory += region->get_live_data_bytes();
         // This is our candidate for later consideration.
         candidates[cand_idx]._region = region;
@@ -369,15 +369,12 @@ double ShenandoahHeuristics::elapsed_cycle_time() const {
 }
 
 bool ShenandoahHeuristics::in_generation(ShenandoahHeapRegion* region) {
-  return ((_generation->generation_mode() == GLOBAL)
-          || (_generation->generation_mode() == YOUNG && region->affiliation() == YOUNG_GENERATION)
-          || (_generation->generation_mode() == OLD && region->affiliation() == OLD_GENERATION));
+  return _generation->is_global()
+          || (_generation->is_young() && region->is_young())
+          || (_generation->is_old()   && region->is_old());
 }
 
 size_t ShenandoahHeuristics::min_free_threshold() {
-  size_t min_free_threshold =
-      _generation->generation_mode() == GenerationMode::OLD
-          ? ShenandoahOldMinFreeThreshold
-          : ShenandoahMinFreeThreshold;
+  size_t min_free_threshold = _generation->is_old() ? ShenandoahOldMinFreeThreshold : ShenandoahMinFreeThreshold;
   return _generation->soft_max_capacity() / 100 * min_free_threshold;
 }