*** old/src/hotspot/share/runtime/vmStructs.cpp	Thu Mar 29 13:44:19 2018
--- new/src/hotspot/share/runtime/vmStructs.cpp	Thu Mar 29 13:44:18 2018

*** 1169,1184 ****
--- 1169,1184 ----
                                                                                                                                       \
    /*********************/                                                                                                            \
    /* -XX flags         */                                                                                                            \
    /*********************/                                                                                                            \
                                                                                                                                       \
!   nonstatic_field(Flag,                        _type,                                         const char*)                           \
!   nonstatic_field(Flag,                        _name,                                         const char*)                           \
!   unchecked_nonstatic_field(Flag,              _addr,                                         sizeof(void*)) /* NOTE: no type */     \
!   nonstatic_field(Flag,                        _flags,                                        Flag::Flags)                           \
!      static_field(Flag,                        flags,                                         Flag*)                                 \
!      static_field(Flag,                        numFlags,                                      size_t)                                \
!   nonstatic_field(JVMFlag,                     _type,                                         const char*)                           \
!   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)                                \
                                                                                                                                       \
    /*************************/                                                                                                        \
    /* JDK / VM version info */                                                                                                        \
    /*************************/                                                                                                        \
                                                                                                                                       \

*** 2079,2090 ****
--- 2079,2090 ----
                                                                            \
    /********************/                                                  \
    /* -XX flags        */                                                  \
    /********************/                                                  \
                                                                            \
!   declare_toplevel_type(Flag)                                             \
!   declare_toplevel_type(Flag*)                                            \
!   declare_toplevel_type(JVMFlag)                                          \
!   declare_toplevel_type(JVMFlag*)                                         \
                                                                            \
    /********************/                                                  \
    /* JVMTI            */                                                  \
    /********************/                                                  \
                                                                            \

*** 2120,2130 ****
--- 2120,2130 ----
     declare_integer_type(InstanceKlass::ClassState)                        \
     declare_integer_type(JavaThreadState)                                  \
     declare_integer_type(ThreadState)                                      \
     declare_integer_type(Location::Type)                                   \
     declare_integer_type(Location::Where)                                  \
!    declare_integer_type(Flag::Flags)                                      \
!    declare_integer_type(JVMFlag::Flags)                                   \
     COMPILER2_PRESENT(declare_integer_type(OptoReg::Name))                 \
                                                                            \
     declare_toplevel_type(CHeapObj<mtInternal>)                            \
              declare_type(Array<int>, MetaspaceObj)                        \
              declare_type(Array<u1>, MetaspaceObj)                         \