--- old/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp	2020-04-05 21:35:13.830794124 -0700
+++ new/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp	2020-04-05 21:35:13.482781024 -0700
@@ -265,18 +265,17 @@
 
 #define SEND_FLAGS_OF_TYPE(eventType, flagType)                   \
   do {                                                            \
-    JVMFlag *flag = JVMFlag::flags;                               \
-    while (flag->_name != NULL) {                                 \
+    JVMFlag *flag;                                                \
+    JVMFLAG_FOR_EACH(flag) {                                      \
       if (flag->is_ ## flagType()) {                              \
         if (flag->is_unlocked()) {                                \
           Event ## eventType event;                               \
-          event.set_name(flag->_name);                            \
+          event.set_name(flag->name());                           \
           event.set_value(flag->get_ ## flagType());              \
           event.set_origin(flag->get_origin());                   \
           event.commit();                                         \
         }                                                         \
       }                                                           \
-      ++flag;                                                     \
     }                                                             \
   } while (0)