< prev index next >

src/hotspot/share/cds/cppVtables.cpp

Print this page
*** 26,10 ***
--- 26,12 ---
  #include "cds/archiveUtils.hpp"
  #include "cds/archiveBuilder.hpp"
  #include "cds/cppVtables.hpp"
  #include "cds/metaspaceShared.hpp"
  #include "logging/log.hpp"
+ #include "oops/flatArrayKlass.hpp"
+ #include "oops/inlineKlass.hpp"
  #include "oops/instanceClassLoaderKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceRefKlass.hpp"
  #include "oops/methodData.hpp"
  #include "oops/objArrayKlass.hpp"

*** 49,19 ***
  //                  the CDS image
  // + at run time:   we clone the actual contents of the vtables from libjvm.so
  //                  into our own tables.
  
  // Currently, the archive contains ONLY the following types of objects that have C++ vtables.
  #define CPP_VTABLE_TYPES_DO(f) \
    f(ConstantPool) \
    f(InstanceKlass) \
    f(InstanceClassLoaderKlass) \
    f(InstanceMirrorKlass) \
    f(InstanceRefKlass) \
    f(Method) \
    f(ObjArrayKlass) \
!   f(TypeArrayKlass)
  
  class CppVtableInfo {
    intptr_t _vtable_size;
    intptr_t _cloned_vtable[1];
  public:
--- 51,22 ---
  //                  the CDS image
  // + at run time:   we clone the actual contents of the vtables from libjvm.so
  //                  into our own tables.
  
  // Currently, the archive contains ONLY the following types of objects that have C++ vtables.
+ // NOTE: this table must be in-sync with sun.jvm.hotspot.memory.FileMapInfo::populateMetadataTypeArray().
  #define CPP_VTABLE_TYPES_DO(f) \
    f(ConstantPool) \
    f(InstanceKlass) \
    f(InstanceClassLoaderKlass) \
    f(InstanceMirrorKlass) \
    f(InstanceRefKlass) \
    f(Method) \
    f(ObjArrayKlass) \
!   f(TypeArrayKlass) \
+   f(FlatArrayKlass) \
+   f(InlineKlass)
  
  class CppVtableInfo {
    intptr_t _vtable_size;
    intptr_t _cloned_vtable[1];
  public:
< prev index next >