--- old/src/hotspot/share/runtime/arguments.cpp	2017-10-17 23:16:57.236803991 +0200
+++ new/src/hotspot/share/runtime/arguments.cpp	2017-10-17 23:16:56.731802763 +0200
@@ -29,6 +29,7 @@
 #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"
@@ -1587,7 +1588,7 @@
   // 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();
+  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(),
@@ -1653,7 +1654,7 @@
   }
 #endif
 
-  jint gc_result = GC::initialize();
+  jint gc_result = GCFactory::initialize();
   if (gc_result != JNI_OK) {
     return gc_result;
   }
@@ -1690,9 +1691,9 @@
 
 void Arguments::set_gc_specific_flags() {
   // Set per-collector flags
-  GC::gc()->initialize_flags();
+  GCFactory::gc()->initialize_flags();
   // Set flags for all collectors.
-  GC::initialize_flags_global();
+  GCFactory::initialize_flags_global();
 }
 
 julong Arguments::limit_by_allocatable_memory(julong limit) {