src/hotspot/share/cds/cppVtables.cpp

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

@@ -26,17 +26,21 @@
  #include "cds/archiveBuilder.hpp"
  #include "cds/archiveUtils.hpp"
  #include "cds/cdsConfig.hpp"
  #include "cds/cppVtables.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/objArrayKlass.hpp"
+ #include "oops/refArrayKlass.hpp"
  #include "oops/trainingData.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "runtime/arguments.hpp"
  #include "utilities/globalDefinitions.hpp"
  

@@ -52,22 +56,26 @@
  //                  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(InstanceStackChunkKlass) \
    f(Method) \
    f(MethodData) \
    f(MethodCounters) \
-   f(ObjArrayKlass) \
    f(TypeArrayKlass) \
+   f(ObjArrayKlass) \
+   f(RefArrayKlass) \
+   f(FlatArrayKlass) \
+   f(InlineKlass) \
    f(KlassTrainingData) \
    f(MethodTrainingData) \
    f(CompileTrainingData)
  
  class CppVtableInfo {