src/hotspot/share/runtime/vmStructs.cpp

*** 58,10 ***
--- 58,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"

*** 936,13 ***
                                                                            \
    declare_toplevel_type(MetaspaceObj)                                     \
      declare_type(Metadata, MetaspaceObj)                                  \
      declare_type(Klass, Metadata)                                         \
             declare_type(ArrayKlass, Klass)                                \
-            declare_type(ObjArrayKlass, ArrayKlass)                        \
             declare_type(TypeArrayKlass, ArrayKlass)                       \
        declare_type(InstanceKlass, Klass)                                  \
          declare_type(InstanceClassLoaderKlass, InstanceKlass)             \
          declare_type(InstanceMirrorKlass, InstanceKlass)                  \
          declare_type(InstanceRefKlass, InstanceKlass)                     \
          declare_type(InstanceStackChunkKlass, InstanceKlass)              \
      declare_type(ConstantPool, Metadata)                                  \
--- 938,16 ---
                                                                            \
    declare_toplevel_type(MetaspaceObj)                                     \
      declare_type(Metadata, MetaspaceObj)                                  \
      declare_type(Klass, Metadata)                                         \
             declare_type(ArrayKlass, Klass)                                \
             declare_type(TypeArrayKlass, ArrayKlass)                       \
+            declare_type(ObjArrayKlass, ArrayKlass)                        \
+              declare_type(FlatArrayKlass, ArrayKlass)                     \
+              declare_type(RefArrayKlass, 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)                                  \

*** 1404,11 ***
    declare_constant(Klass::_lh_element_type_mask)                          \
    declare_constant(Klass::_lh_header_size_shift)                          \
    declare_constant(Klass::_lh_header_size_mask)                           \
    declare_constant(Klass::_lh_array_tag_shift)                            \
    declare_constant(Klass::_lh_array_tag_type_value)                       \
!   declare_constant(Klass::_lh_array_tag_obj_value)                        \
                                                                            \
    declare_constant(Method::nonvirtual_vtable_index)                       \
    declare_constant(Method::extra_stack_entries_for_jsr292)                \
                                                                            \
    /********************************/                                      \
--- 1409,11 ---
    declare_constant(Klass::_lh_element_type_mask)                          \
    declare_constant(Klass::_lh_header_size_shift)                          \
    declare_constant(Klass::_lh_header_size_mask)                           \
    declare_constant(Klass::_lh_array_tag_shift)                            \
    declare_constant(Klass::_lh_array_tag_type_value)                       \
!   declare_constant(Klass::_lh_array_tag_ref_value)                        \
                                                                            \
    declare_constant(Method::nonvirtual_vtable_index)                       \
    declare_constant(Method::extra_stack_entries_for_jsr292)                \
                                                                            \
    /********************************/                                      \