< prev index next >

src/hotspot/share/runtime/vmStructs.cpp

Print this page
@@ -64,10 +64,12 @@
  #include "oops/arrayOop.hpp"
  #include "oops/compiledICHolder.hpp"
  #include "oops/constMethod.hpp"
  #include "oops/constantPool.hpp"
  #include "oops/cpCache.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/klass.hpp"

@@ -219,11 +221,11 @@
    nonstatic_field(ConstantPool,                _source_file_name_index,                       u2)                                    \
    nonstatic_field(ConstantPoolCache,           _resolved_references,                          OopHandle)                             \
    nonstatic_field(ConstantPoolCache,           _reference_map,                                Array<u2>*)                            \
    nonstatic_field(ConstantPoolCache,           _length,                                       int)                                   \
    nonstatic_field(ConstantPoolCache,           _constant_pool,                                ConstantPool*)                         \
-   volatile_nonstatic_field(InstanceKlass,      _array_klasses,                                ObjArrayKlass*)                        \
+   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,               _fields,                                       Array<u2>*)                            \

@@ -234,11 +236,11 @@
    nonstatic_field(InstanceKlass,               _nonstatic_field_size,                         int)                                   \
    nonstatic_field(InstanceKlass,               _static_field_size,                            int)                                   \
    nonstatic_field(InstanceKlass,               _static_oop_field_count,                       u2)                                    \
    nonstatic_field(InstanceKlass,               _nonstatic_oop_map_size,                       int)                                   \
    nonstatic_field(InstanceKlass,               _is_marked_dependent,                          bool)                                  \
-   nonstatic_field(InstanceKlass,               _misc_flags,                                   u2)                                    \
+   nonstatic_field(InstanceKlass,               _misc_flags,                                   u4)                                    \
    nonstatic_field(InstanceKlass,               _init_state,                                   u1)                                    \
    nonstatic_field(InstanceKlass,               _init_thread,                                  Thread*)                               \
    nonstatic_field(InstanceKlass,               _itable_len,                                   int)                                   \
    nonstatic_field(InstanceKlass,               _reference_type,                               u1)                                    \
    volatile_nonstatic_field(InstanceKlass,      _oop_map_cache,                                OopMapCache*)                          \

@@ -1219,13 +1221,15 @@
    declare_toplevel_type(CompiledICHolder)                                 \
    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(ConstantPool, Metadata)                                  \
      declare_type(ConstantPoolCache, MetaspaceObj)                         \

@@ -1591,10 +1595,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)                       \

@@ -2270,10 +2275,14 @@
    declare_constant(InstanceKlass::_misc_has_been_redefined)               \
    declare_constant(InstanceKlass::_misc_is_scratch_class)                 \
    declare_constant(InstanceKlass::_misc_is_shared_boot_class)             \
    declare_constant(InstanceKlass::_misc_is_shared_platform_class)         \
    declare_constant(InstanceKlass::_misc_is_shared_app_class)              \
+   declare_constant(InstanceKlass::_misc_invalid_inline_super)             \
+   declare_constant(InstanceKlass::_misc_invalid_identity_super)           \
+   declare_constant(InstanceKlass::_misc_has_injected_primitiveObject)     \
+   declare_constant(InstanceKlass::_misc_has_injected_identityObject)      \
                                                                            \
    /*********************************/                                     \
    /* Symbol* - symbol max length */                                       \
    /*********************************/                                     \
                                                                            \
< prev index next >