Pack old evacuations tightly

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

@@ -77,7 +77,7 @@ ShenandoahHeuristics::~ShenandoahHeuristics() {
   FREE_C_HEAP_ARRAY(RegionGarbage, _region_data);
 }
 
-size_t ShenandoahHeuristics::prioritize_aged_regions(size_t old_available, size_t num_regions, bool preselected_regions[]) {
+size_t ShenandoahHeuristics::select_aged_regions(size_t old_available, size_t num_regions, bool preselected_regions[]) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   size_t old_consumed = 0;
   if (heap->mode()->is_generational()) {
@@ -153,7 +153,7 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
 
           // TODO: Deprecate and/or refine ShenandoahTenuredRegionUsageBias.  If we preselect the regions, we can just
           // set garbage to "max" value, which is the region size rather than doing this extra work to bias selection.
-          // May also want to exercise more discretion in prioritize_aged_regions() if we decide there are good reasons
+          // May also want to exercise more discretion in select_aged_regions() if we decide there are good reasons
           // to not promote all eligible aged regions on the current GC pass.
 
           // If we're at tenure age, bias at least once.

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

@@ -153,7 +153,7 @@ class ShenandoahHeuristics : public CHeapObj<mtGC> {
 
   virtual void record_requested_gc();
 
-  virtual size_t prioritize_aged_regions(size_t old_available, size_t num_regions, bool preselected_regions[]);
+  virtual size_t select_aged_regions(size_t old_available, size_t num_regions, bool preselected_regions[]);
 
   virtual void choose_collection_set(ShenandoahCollectionSet* collection_set, ShenandoahOldHeuristics* old_heuristics);
 

src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp

@@ -393,12 +393,12 @@ void  ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent)
       //       set (because it has less live data and thus can fit within the evacuation limits even though it has less
       //       garbage).
 
-      size_t young_evacuation_reserve = (young_generation->soft_max_capacity() * ShenandoahEvacReserve) / 100;
+      size_t young_evacuation_reserve = (young_generation->max_capacity() * ShenandoahEvacReserve) / 100;
       // old evacuation can pack into existing partially used regions.  young evacuation and loans for young allocations
       // need to target regions that do not already hold any old-gen objects.  Round down.
       regions_available_to_loan = old_generation->free_unaffiliated_regions();
-      consumed_by_advance_promotion = _heuristics->prioritize_aged_regions(old_generation->available() - old_evacuation_reserve,
-                                                                           num_regions, preselected_regions);
+      consumed_by_advance_promotion = _heuristics->select_aged_regions(old_generation->available() - old_evacuation_reserve,
+                                                                       num_regions, preselected_regions);
       size_t net_available_old_regions =
         (old_generation->available() - old_evacuation_reserve - consumed_by_advance_promotion) / region_size_bytes;