--- old/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	2018-03-29 13:44:06.000000000 -0500
+++ new/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	2018-03-29 13:44:06.000000000 -0500
@@ -125,7 +125,7 @@
   }
   ResourceMark rm;
   const char* cstring = java_lang_String::as_utf8_string(name());
-  Flag* flag = Flag::find_flag(cstring, strlen(cstring), /* allow_locked */ true, /* return_flag */ true);
+  JVMFlag* flag = JVMFlag::find_flag(cstring, strlen(cstring), /* allow_locked */ true, /* return_flag */ true);
   if (flag == NULL) {
     return c2vm;
   }