*** old/src/hotspot/share/jvmci/vmStructs_jvmci.cpp	Thu Apr  5 12:03:19 2018
--- new/src/hotspot/share/jvmci/vmStructs_jvmci.cpp	Thu Apr  5 12:03:19 2018

*** 148,162 ****
--- 148,162 ----
    nonstatic_field(ExceptionTableElement,       start_pc,                                      u2)                                    \
    nonstatic_field(ExceptionTableElement,       end_pc,                                        u2)                                    \
    nonstatic_field(ExceptionTableElement,       handler_pc,                                    u2)                                    \
    nonstatic_field(ExceptionTableElement,       catch_type_index,                              u2)                                    \
                                                                                                                                       \
!   nonstatic_field(Flag,                        _type,                                          const char*)                          \
!   nonstatic_field(Flag,                        _name,                                          const char*)                          \
!   unchecked_nonstatic_field(Flag,              _addr,                                          sizeof(void*))                        \
!   nonstatic_field(Flag,                        _flags,                                         Flag::Flags)                          \
!   static_field(Flag,                           flags,                                          Flag*)                                \
!   nonstatic_field(JVMFlag,                     _type,                                         const char*)                           \
!   nonstatic_field(JVMFlag,                     _name,                                         const char*)                           \
!   unchecked_nonstatic_field(JVMFlag,           _addr,                                         sizeof(void*))                         \
!   nonstatic_field(JVMFlag,                     _flags,                                        JVMFlag::Flags)                        \
!   static_field(JVMFlag,                        flags,                                         JVMFlag*)                              \
                                                                                                                                       \
    nonstatic_field(InstanceKlass,               _fields,                                       Array<u2>*)                            \
    nonstatic_field(InstanceKlass,               _constants,                                    ConstantPool*)                         \
    nonstatic_field(InstanceKlass,               _source_file_name_index,                       u2)                                    \
    nonstatic_field(InstanceKlass,               _init_state,                                   u1)                                    \

*** 344,355 ****
--- 344,355 ----
    declare_unsigned_integer_type(uintx)                                    \
                                                                            \
    declare_toplevel_type(BasicLock)                                        \
    declare_toplevel_type(CompilerToVM)                                     \
    declare_toplevel_type(ExceptionTableElement)                            \
!   declare_toplevel_type(Flag)                                             \
!   declare_toplevel_type(Flag*)                                            \
!   declare_toplevel_type(JVMFlag)                                          \
!   declare_toplevel_type(JVMFlag*)                                         \
    declare_toplevel_type(InvocationCounter)                                \
    declare_toplevel_type(JVMCIEnv)                                         \
    declare_toplevel_type(LocalVariableTableElement)                        \
    declare_toplevel_type(narrowKlass)                                      \
    declare_toplevel_type(Symbol*)                                          \