--- old/src/hotspot/cpu/zero/globals_zero.hpp	2020-04-05 21:34:52.313984193 -0700
+++ new/src/hotspot/cpu/zero/globals_zero.hpp	2020-04-05 21:34:51.965971093 -0700
@@ -73,19 +73,10 @@
 // No performance work done here yet.
 define_pd_global(bool, CompactStrings, false);
 
-#define ARCH_FLAGS(develop, \
-                   product, \
-                   diagnostic, \
-                   experimental, \
-                   notproduct, \
-                   range, \
-                   constraint)  \
-                                                                            \
-  product(bool, UseFastEmptyMethods, true,                                  \
-          "Use fast method entry code for empty methods")                   \
-                                                                            \
-  product(bool, UseFastAccessorMethods, true,                               \
-          "Use fast method entry code for accessor methods")                \
-                                                                            \
+#include "runtime/flags/jvmFlag.hpp"
+PRODUCT_FLAG(bool,     UseFastEmptyMethods, true, JVMFlag::DEFAULT,
+                       "Use fast method entry code for empty methods");
 
+PRODUCT_FLAG(bool,     UseFastAccessorMethods, true, JVMFlag::DEFAULT,
+                       "Use fast method entry code for accessor methods");
 #endif // CPU_ZERO_GLOBALS_ZERO_HPP