src/hotspot/share/cds/cppVtables.cpp

@@ -26,18 +26,22 @@
  #include "cds/archiveBuilder.hpp"
  #include "cds/cdsConfig.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/instanceKlass.inline.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceRefKlass.hpp"
  #include "oops/instanceStackChunkKlass.hpp"
  #include "oops/methodCounters.hpp"
  #include "oops/methodData.hpp"
  #include "oops/trainingData.hpp"
  #include "oops/objArrayKlass.hpp"
+ #include "oops/refArrayKlass.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "runtime/arguments.hpp"
  #include "utilities/globalDefinitions.hpp"
  
  // Objects of the Metadata types (such as Klass and ConstantPool) have C++ vtables.

@@ -52,10 +56,11 @@
  //                  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) \

@@ -64,10 +69,13 @@
    f(Method) \
    f(MethodData) \
    f(MethodCounters) \
    f(ObjArrayKlass) \
    f(TypeArrayKlass) \
+   f(FlatArrayKlass) \
+   f(InlineKlass) \
+   f(RefArrayKlass) \
    f(KlassTrainingData) \
    f(MethodTrainingData) \
    f(CompileTrainingData)
  
  class CppVtableInfo {