--- old/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	2018-04-05 12:03:18.000000000 -0500
+++ new/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp	2018-04-05 12:03:18.000000000 -0500
@@ -377,9 +377,9 @@
 #define COUNT_FLAG(ignore) +1
 #ifdef ASSERT
 #define CHECK_FLAG(type, name) { \
-  Flag* flag = Flag::find_flag(#name, strlen(#name), /*allow_locked*/ true, /* return_flag */ true); \
+  JVMFlag* flag = JVMFlag::find_flag(#name, strlen(#name), /*allow_locked*/ true, /* return_flag */ true); \
   assert(flag != NULL, "No such flag named " #name); \
-  assert(flag->is_##type(), "Flag " #name " is not of type " #type); \
+  assert(flag->is_##type(), "JVMFlag " #name " is not of type " #type); \
 }
 #else
 #define CHECK_FLAG(type, name)