src/hotspot/share/runtime/vmStructs.cpp

*** 66,10 ***
--- 66,12 ---
  #include "oops/arrayOop.hpp"
  #include "oops/constMethod.hpp"
  #include "oops/constantPool.hpp"
  #include "oops/cpCache.hpp"
  #include "oops/fieldInfo.hpp"
+ #include "oops/flatArrayKlass.hpp"
+ #include "oops/inlineKlass.hpp"
  #include "oops/instanceClassLoaderKlass.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/instanceStackChunkKlass.hpp"

*** 228,11 ***
    nonstatic_field(ResolvedFieldEntry,          _cpool_index,                                  u2)                                    \
    nonstatic_field(ConstantPoolCache,           _resolved_method_entries,                      Array<ResolvedMethodEntry>*)           \
    nonstatic_field(ResolvedMethodEntry,         _cpool_index,                                  u2)                                    \
    nonstatic_field(ConstantPoolCache,           _resolved_indy_entries,                        Array<ResolvedIndyEntry>*)             \
    nonstatic_field(ResolvedIndyEntry,           _cpool_index,                                  u2)                                    \
!   volatile_nonstatic_field(InstanceKlass,      _array_klasses,                                ObjArrayKlass*)                        \
    nonstatic_field(InstanceKlass,               _methods,                                      Array<Method*>*)                       \
    nonstatic_field(InstanceKlass,               _default_methods,                              Array<Method*>*)                       \
    nonstatic_field(InstanceKlass,               _local_interfaces,                             Array<InstanceKlass*>*)                \
    nonstatic_field(InstanceKlass,               _transitive_interfaces,                        Array<InstanceKlass*>*)                \
    nonstatic_field(InstanceKlass,               _fieldinfo_stream,                             Array<u1>*)                            \
--- 230,11 ---
    nonstatic_field(ResolvedFieldEntry,          _cpool_index,                                  u2)                                    \
    nonstatic_field(ConstantPoolCache,           _resolved_method_entries,                      Array<ResolvedMethodEntry>*)           \
    nonstatic_field(ResolvedMethodEntry,         _cpool_index,                                  u2)                                    \
    nonstatic_field(ConstantPoolCache,           _resolved_indy_entries,                        Array<ResolvedIndyEntry>*)             \
    nonstatic_field(ResolvedIndyEntry,           _cpool_index,                                  u2)                                    \
!   volatile_nonstatic_field(InstanceKlass,      _array_klasses,                                ArrayKlass*)                        \
    nonstatic_field(InstanceKlass,               _methods,                                      Array<Method*>*)                       \
    nonstatic_field(InstanceKlass,               _default_methods,                              Array<Method*>*)                       \
    nonstatic_field(InstanceKlass,               _local_interfaces,                             Array<InstanceKlass*>*)                \
    nonstatic_field(InstanceKlass,               _transitive_interfaces,                        Array<InstanceKlass*>*)                \
    nonstatic_field(InstanceKlass,               _fieldinfo_stream,                             Array<u1>*)                            \

*** 1161,13 ***
--- 1163,15 ---
                                                                            \
    declare_toplevel_type(MetaspaceObj)                                     \
      declare_type(Metadata, MetaspaceObj)                                  \
      declare_type(Klass, Metadata)                                         \
             declare_type(ArrayKlass, Klass)                                \
+            declare_type(FlatArrayKlass, ArrayKlass)                       \
             declare_type(ObjArrayKlass, ArrayKlass)                        \
             declare_type(TypeArrayKlass, ArrayKlass)                       \
        declare_type(InstanceKlass, Klass)                                  \
+         declare_type(InlineKlass, InstanceKlass)                          \
          declare_type(InstanceClassLoaderKlass, InstanceKlass)             \
          declare_type(InstanceMirrorKlass, InstanceKlass)                  \
          declare_type(InstanceRefKlass, InstanceKlass)                     \
          declare_type(InstanceStackChunkKlass, InstanceKlass)              \
      declare_type(ConstantPool, Metadata)                                  \

*** 1543,10 ***
--- 1547,11 ---
    declare_c2_type(MachNode, Node)                                         \
    declare_c2_type(MachIdealNode, MachNode)                                \
    declare_c2_type(MachTypeNode, MachNode)                                 \
    declare_c2_type(MachBreakpointNode, MachIdealNode)                      \
    declare_c2_type(MachUEPNode, MachIdealNode)                             \
+   declare_c2_type(MachVEPNode, MachIdealNode)                             \
    declare_c2_type(MachPrologNode, MachIdealNode)                          \
    declare_c2_type(MachEpilogNode, MachIdealNode)                          \
    declare_c2_type(MachNopNode, MachIdealNode)                             \
    declare_c2_type(MachSpillCopyNode, MachIdealNode)                       \
    declare_c2_type(MachNullCheckNode, MachIdealNode)                       \