src/hotspot/share/cds/cppVtables.cpp

*** 28,17 ***
--- 28,21 ---
  #include "cds/archiveUtils.hpp"
  #include "cds/cdsConfig.hpp"
  #include "cds/cppVtables.hpp"
  #include "logging/log.hpp"
  #include "memory/resourceArea.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/objArrayKlass.hpp"
+ #include "oops/refArrayKlass.hpp"
  #include "oops/trainingData.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "runtime/arguments.hpp"
  #include "utilities/globalDefinitions.hpp"
  

*** 67,22 ***
    f(GrowableArray_ModuleEntry_ptr) \
  
  #endif
  
  // 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(InstanceStackChunkKlass) \
    f(Method) \
    f(MethodData) \
    f(MethodCounters) \
-   f(ObjArrayKlass) \
    f(TypeArrayKlass) \
    f(KlassTrainingData) \
    f(MethodTrainingData) \
    f(CompileTrainingData) \
    NOT_PRODUCT(DEBUG_CPP_VTABLE_TYPES_DO(f))
  
--- 71,26 ---
    f(GrowableArray_ModuleEntry_ptr) \
  
  #endif
  
  // 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(InstanceStackChunkKlass) \
    f(Method) \
    f(MethodData) \
    f(MethodCounters) \
    f(TypeArrayKlass) \
+   f(ObjArrayKlass) \
+   f(RefArrayKlass) \
+   f(FlatArrayKlass) \
+   f(InlineKlass) \
    f(KlassTrainingData) \
    f(MethodTrainingData) \
    f(CompileTrainingData) \
    NOT_PRODUCT(DEBUG_CPP_VTABLE_TYPES_DO(f))