src/hotspot/share/gc/shared/genCollectedHeap.cpp

@@ -107,25 +107,21 @@
   initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
 
   _rem_set = new CardTableRS(reserved_region());
   set_barrier_set(rem_set()->bs());
 
-  ReservedSpace young_rs = heap_rs.first_part(young_gen_spec()->max_size(), false, false);
-  _young_gen = young_gen_spec()->init(young_rs, rem_set());
-  heap_rs = heap_rs.last_part(young_gen_spec()->max_size());
+  ReservedSpace young_rs = heap_rs.first_part(_young_gen_spec->max_size(), false, false);
+  _young_gen = _young_gen_spec->init(young_rs, rem_set());
+  heap_rs = heap_rs.last_part(_young_gen_spec->max_size());
 
-  ReservedSpace old_rs = heap_rs.first_part(old_gen_spec()->max_size(), false, false);
-  _old_gen = old_gen_spec()->init(old_rs, rem_set());
+  ReservedSpace old_rs = heap_rs.first_part(_old_gen_spec->max_size(), false, false);
+  _old_gen = _old_gen_spec->init(old_rs, rem_set());
   clear_incremental_collection_failed();
 
   return JNI_OK;
 }
 
-void GenCollectedHeap::initialize_generations(Generation::Name young,
-                                              Generation::Name old) {
-}
-
 void GenCollectedHeap::initialize_size_policy(size_t init_eden_size,
                                               size_t init_promo_size,
                                               size_t init_survivor_size) {
   const double max_gc_pause_sec = ((double) MaxGCPauseMillis) / 1000.0;
   _size_policy = new AdaptiveSizePolicy(init_eden_size,

@@ -139,16 +135,13 @@
                                  ReservedSpace* heap_rs){
   // Now figure out the total size.
   const size_t pageSize = UseLargePages ? os::large_page_size() : os::vm_page_size();
   assert(alignment % pageSize == 0, "Must be");
 
-  GenerationSpec* young_spec = young_gen_spec();
-  GenerationSpec* old_spec = old_gen_spec();
-
   // Check for overflow.
-  size_t total_reserved = young_spec->max_size() + old_spec->max_size();
-  if (total_reserved < young_spec->max_size()) {
+  size_t total_reserved = _young_gen_spec->max_size() + _old_gen_spec->max_size();
+  if (total_reserved < _young_gen_spec->max_size()) {
     vm_exit_during_initialization("The size of the object heap + VM data exceeds "
                                   "the maximum representable size");
   }
   assert(total_reserved % alignment == 0,
          "Gen size; total_reserved=" SIZE_FORMAT ", alignment="

@@ -183,16 +176,14 @@
   _young_gen->ref_processor_init();
   _old_gen->ref_processor_init();
 }
 
 GenerationSpec* GenCollectedHeap::young_gen_spec() const {
-  assert(_young_gen_spec != NULL, "_young_gen_spec should have been initialized");
   return _young_gen_spec;
 }
 
 GenerationSpec* GenCollectedHeap::old_gen_spec() const {
-  assert(_old_gen_spec != NULL, "_old_gen_spec should have been initialized");
   return _old_gen_spec;
 }
 
 size_t GenCollectedHeap::capacity() const {
   return _young_gen->capacity() + _old_gen->capacity();