*** old/src/hotspot/share/jvmci/jvmci_globals.cpp	Fri Jun  8 17:51:20 2018
--- new/src/hotspot/share/jvmci/jvmci_globals.cpp	Fri Jun  8 17:51:19 2018

*** 23,32 ****
--- 23,33 ----
   */
  
  #include "precompiled.hpp"
  #include "jvm.h"
  #include "jvmci/jvmci_globals.hpp"
+ #include "gc/shared/gcConfig.hpp"
  #include "utilities/defaultStream.hpp"
  #include "runtime/globals_extension.hpp"
  
  JVMCI_FLAGS(MATERIALIZE_DEVELOPER_FLAG, \
              MATERIALIZE_PD_DEVELOPER_FLAG, \

*** 111,115 ****
--- 112,126 ----
  #undef JVMCI_FLAG_CHECKED
  #endif
  #undef CHECK_NOT_SET
    return true;
  }
+ void JVMCIGlobals::check_jvmci_supported_gc() {
+   if (EnableJVMCI) {
+     // Check if selected GC is supported by JVMCI and Java compiler
+     if (!(UseSerialGC || UseParallelGC || UseParallelOldGC || UseG1GC)) {
+       vm_exit_during_initialization("JVMCI Compiler does not support selected GC", GCConfig::hs_err_name());
+       FLAG_SET_DEFAULT(EnableJVMCI, false);
+       FLAG_SET_DEFAULT(UseJVMCICompiler, false);
+     }
+   }
+ }