src/hotspot/share/runtime/arguments.cpp

*** 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 = GCArguments::instance()->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 = GCArguments::arguments()->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());
  }
*** 1652,1662 ****
    if (!compilation_mode_selected()) {
      select_compilation_mode_ergonomically();
    }
  #endif
  
!   jint gc_result = GCArguments::create_instance();
    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 = GCArguments::initialize();
    if (gc_result != JNI_OK) {
      return gc_result;
    }
  
  #if defined(COMPILER2) || INCLUDE_JVMCI
*** 1689,1699 ****
    return JNI_OK;
  }
  
  void Arguments::set_gc_specific_flags() {
    // Set GC flags
!   GCArguments::instance()->initialize_flags();
  }
  
  julong Arguments::limit_by_allocatable_memory(julong limit) {
    julong max_allocatable;
    julong result = limit;
--- 1689,1699 ----
    return JNI_OK;
  }
  
  void Arguments::set_gc_specific_flags() {
    // Set GC flags
!   GCArguments::arguments()->initialize_flags();
  }
  
  julong Arguments::limit_by_allocatable_memory(julong limit) {
    julong max_allocatable;
    julong result = limit;