--- old/src/hotspot/share/jvmci/jvmciRuntime.cpp	2018-02-27 08:50:11.209590405 -0800
+++ new/src/hotspot/share/jvmci/jvmciRuntime.cpp	2018-02-27 08:50:10.978568643 -0800
@@ -596,6 +596,7 @@
 JRT_END
 
 void JVMCIRuntime::force_initialization(TRAPS) {
+  Arguments::set_force_init_jvmci_runtime(true);
   JVMCIRuntime::initialize_well_known_classes(CHECK);
 
   ResourceMark rm;
@@ -604,6 +605,7 @@
   Handle jvmciRuntime = JVMCIRuntime::get_HotSpotJVMCIRuntime(CHECK);
   JavaValue result(T_OBJECT);
   JavaCalls::call_virtual(&result, jvmciRuntime, HotSpotJVMCIRuntime::klass(), getCompiler, sig, CHECK);
+  Arguments::set_force_init_jvmci_runtime(false);
 }
 
 // private static JVMCIRuntime JVMCI.initializeRuntime()