--- old/src/hotspot/share/gc/parallel/psYoungGen.cpp 2020-05-11 12:37:09.699631540 -0400 +++ new/src/hotspot/share/gc/parallel/psYoungGen.cpp 2020-05-11 12:37:09.303618315 -0400 @@ -41,7 +41,6 @@ _eden_space(NULL), _from_space(NULL), _to_space(NULL), - _init_gen_size(initial_size), _min_gen_size(min_size), _max_gen_size(max_size), _gen_counters(NULL), @@ -49,20 +48,21 @@ _from_counters(NULL), _to_counters(NULL) { - initialize(rs, GenAlignment); + initialize(rs, initial_size, GenAlignment); } -void PSYoungGen::initialize_virtual_space(ReservedSpace rs, size_t alignment) { - assert(_init_gen_size != 0, "Should have a finite size"); +void PSYoungGen::initialize_virtual_space(ReservedSpace rs, + size_t initial_size, + size_t alignment) { + assert(initial_size != 0, "Should have a finite size"); _virtual_space = new PSVirtualSpace(rs, alignment); - if (!virtual_space()->expand_by(_init_gen_size)) { - vm_exit_during_initialization("Could not reserve enough space for " - "object heap"); + if (!virtual_space()->expand_by(initial_size)) { + vm_exit_during_initialization("Could not reserve enough space for object heap"); } } -void PSYoungGen::initialize(ReservedSpace rs, size_t alignment) { - initialize_virtual_space(rs, alignment); +void PSYoungGen::initialize(ReservedSpace rs, size_t initial_size, size_t alignment) { + initialize_virtual_space(rs, initial_size, alignment); initialize_work(); } @@ -92,8 +92,8 @@ _to_space = new MutableSpace(virtual_space()->alignment()); // Generation Counters - generation 0, 3 subspaces - _gen_counters = new PSGenerationCounters("new", 0, 3, _min_gen_size, - _max_gen_size, _virtual_space); + _gen_counters = new PSGenerationCounters("new", 0, 3, min_gen_size(), + max_gen_size(), virtual_space()); // Compute maximum space sizes for performance counters size_t alignment = SpaceAlignment; @@ -259,7 +259,7 @@ " used: " SIZE_FORMAT " capacity: " SIZE_FORMAT " gen limits: " SIZE_FORMAT " / " SIZE_FORMAT, eden_size, survivor_size, used_in_bytes(), capacity_in_bytes(), - _max_gen_size, min_gen_size()); + max_gen_size(), min_gen_size()); } } @@ -270,7 +270,7 @@ bool size_changed = false; // There used to be this guarantee there. - // guarantee ((eden_size + 2*survivor_size) <= _max_gen_size, "incorrect input arguments"); + // guarantee ((eden_size + 2*survivor_size) <= max_gen_size(), "incorrect input arguments"); // Code below forces this requirement. In addition the desired eden // size and desired survivor sizes are desired goals and may // exceed the total generation size.