8369418: Identify owning class for KlassTrainingData in AOT map output

Reviewed-by: iklam, adinn

Author: Delawen

src/hotspot/share/cds/aotMapLogger.cpp

@@ -36,6 +36,7 @@
 #include "oops/methodCounters.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/growableArray.hpp"
@@ -359,6 +360,9 @@ void AOTMapLogger::log_metaspace_objects_impl(address region_base, address regio
     case MetaspaceObj::SymbolType:
       log_symbol((Symbol*)src, requested_addr, type_name, bytes, current);
       break;
+    case MetaspaceObj::KlassTrainingDataType:
+      log_klass_training_data((KlassTrainingData*)src, requested_addr, type_name, bytes, current);
+      break;
     default:
       log_debug(aot, map)(_LOG_PREFIX, p2i(requested_addr), type_name, bytes);
       break;
@@ -427,6 +431,16 @@ void AOTMapLogger::log_symbol(Symbol* s, address requested_addr, const char* typ
   log_debug(aot, map)(_LOG_PREFIX " %s", p2i(requested_addr), type_name, bytes,
                       s->as_quoted_ascii());
 }
+void AOTMapLogger::log_klass_training_data(KlassTrainingData* ktd, address requested_addr, const char* type_name,
+                                           int bytes, Thread* current) {
+  ResourceMark rm(current);
+  if (ktd->has_holder()) {
+    log_debug(aot, map)(_LOG_PREFIX " %s", p2i(requested_addr), type_name, bytes,
+                        ktd->name()->as_klass_external_name());
+  } else {
+    log_debug(aot, map)(_LOG_PREFIX, p2i(requested_addr), type_name, bytes);
+  }
+}
 
 #undef _LOG_PREFIX
 

src/hotspot/share/cds/aotMapLogger.hpp

@@ -35,6 +35,7 @@
 class ArchiveHeapInfo;
 class DumpRegion;
 class FileMapInfo;
+class KlassTrainingData;
 class outputStream;
 
 // Write detailed info to a mapfile to analyze contents of the AOT cache/CDS archive.
@@ -105,6 +106,7 @@ class AOTMapLogger : AllStatic {
   static void log_klass(Klass* k, address requested_addr, const char* type_name, int bytes, Thread* current);
   static void log_method(Method* m, address requested_addr, const char* type_name, int bytes, Thread* current);
   static void log_symbol(Symbol* s, address requested_addr, const char* type_name, int bytes, Thread* current);
+  static void log_klass_training_data(KlassTrainingData* ktd, address requested_addr, const char* type_name, int bytes, Thread* current);
 
 
 #if INCLUDE_CDS_JAVA_HEAP