src/hotspot/share/runtime/arguments.cpp

*** 27,36 ****
--- 27,37 ----
  #include "classfile/javaAssertions.hpp"
  #include "classfile/moduleEntry.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
  #include "gc/shared/gc.hpp"
+ #include "gc/shared/gcFactory.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/taskqueue.hpp"
  #include "logging/log.hpp"
  #include "logging/logConfiguration.hpp"
*** 1585,1595 ****
  void Arguments::set_conservative_max_heap_alignment() {
    // The conservative maximum required alignment for the heap is the maximum of
    // the alignments imposed by several sources: any requirements from the heap
    // itself, the collector policy and the maximum page size we may run the VM
    // with.
!   size_t heap_alignment = GC::gc()->conservative_max_heap_alignment();
    _conservative_max_heap_alignment = MAX4(heap_alignment,
                                            (size_t)os::vm_allocation_granularity(),
                                            os::max_page_size(),
                                            CollectorPolicy::compute_heap_alignment());
  }
--- 1586,1596 ----
  void Arguments::set_conservative_max_heap_alignment() {
    // The conservative maximum required alignment for the heap is the maximum of
    // the alignments imposed by several sources: any requirements from the heap
    // itself, the collector policy and the maximum page size we may run the VM
    // with.
!   size_t heap_alignment = GCFactory::gc()->conservative_max_heap_alignment();
    _conservative_max_heap_alignment = MAX4(heap_alignment,
                                            (size_t)os::vm_allocation_granularity(),
                                            os::max_page_size(),
                                            CollectorPolicy::compute_heap_alignment());
  }
*** 1651,1661 ****
    if (!compilation_mode_selected()) {
      select_compilation_mode_ergonomically();
    }
  #endif
  
!   jint gc_result = GC::initialize();
    if (gc_result != JNI_OK) {
      return gc_result;
    }
  
  #if defined(COMPILER2) || INCLUDE_JVMCI
--- 1652,1662 ----
    if (!compilation_mode_selected()) {
      select_compilation_mode_ergonomically();
    }
  #endif
  
!   jint gc_result = GCFactory::initialize();
    if (gc_result != JNI_OK) {
      return gc_result;
    }
  
  #if defined(COMPILER2) || INCLUDE_JVMCI
*** 1688,1700 ****
    return JNI_OK;
  }
  
  void Arguments::set_gc_specific_flags() {
    // Set per-collector flags
!   GC::gc()->initialize_flags();
    // Set flags for all collectors.
!   GC::initialize_flags_global();
  }
  
  julong Arguments::limit_by_allocatable_memory(julong limit) {
    julong max_allocatable;
    julong result = limit;
--- 1689,1701 ----
    return JNI_OK;
  }
  
  void Arguments::set_gc_specific_flags() {
    // Set per-collector flags
!   GCFactory::gc()->initialize_flags();
    // Set flags for all collectors.
!   GCFactory::initialize_flags_global();
  }
  
  julong Arguments::limit_by_allocatable_memory(julong limit) {
    julong max_allocatable;
    julong result = limit;