--- old/src/hotspot/share/runtime/vmStructs.cpp	2020-04-05 21:35:26.771281227 -0700
+++ new/src/hotspot/share/runtime/vmStructs.cpp	2020-04-05 21:35:26.419267977 -0700
@@ -1026,12 +1026,12 @@
   /* -XX flags         */                                                                                                            \
   /*********************/                                                                                                            \
                                                                                                                                      \
-  nonstatic_field(JVMFlag,                     _type,                                         const char*)                           \
+  nonstatic_field(JVMFlag,                     _type,                                         short)                                 \
   nonstatic_field(JVMFlag,                     _name,                                         const char*)                           \
-  unchecked_nonstatic_field(JVMFlag,           _addr,                                         sizeof(void*)) /* NOTE: no type */     \
-  nonstatic_field(JVMFlag,                     _flags,                                        JVMFlag::Flags)                        \
-     static_field(JVMFlag,                     flags,                                         JVMFlag*)                              \
-     static_field(JVMFlag,                     numFlags,                                      size_t)                                \
+  unchecked_nonstatic_field(JVMFlag,           _value_addr,                                   sizeof(void*)) /* NOTE: no type */     \
+  nonstatic_field(JVMFlag,                     _attr,                                         int)                                   \
+  nonstatic_field(JVMFlag,                     _next,                                         JVMFlag*)                              \
+     static_field(JVMFlag,                     _head,                                         JVMFlag*)                              \
                                                                                                                                      \
   /*************************/                                                                                                        \
   /* JDK / VM version info */                                                                                                        \