8366701: [lworld] Method profiles for AOT cache introduced with JEP 515 miss Valhalla specific profiling

chhagedorn · chhagedorn · commit 9aff71a2c82e · 2025-09-11T07:10:32.000Z
Reviewed-by: thartmann
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
@@ -1980,6 +1980,11 @@ class ArrayStoreData : public ReceiverTypeData {
     _array.clean_weak_klass_links(always_clean);
   }
 
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {
+    ReceiverTypeData::metaspace_pointers_do(it);
+    _array.metaspace_pointers_do(it);
+  }
+
   static ByteSize array_store_data_size() {
     return cell_offset(static_cell_count());
   }
@@ -2053,6 +2058,11 @@ class ArrayLoadData : public ProfileData {
     _element.clean_weak_klass_links(always_clean);
   }
 
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {
+    _array.metaspace_pointers_do(it);
+    _element.metaspace_pointers_do(it);
+  }
+
   static ByteSize array_load_data_size() {
     return cell_offset(static_cell_count());
   }
@@ -2126,6 +2136,11 @@ class ACmpData : public BranchData {
     _right.clean_weak_klass_links(always_clean);
   }
 
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {
+    _left.metaspace_pointers_do(it);
+    _right.metaspace_pointers_do(it);
+  }
+
   static ByteSize acmp_data_size() {
     return cell_offset(static_cell_count());
   }
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
@@ -171,62 +171,6 @@ runtime/cds/TestDefaultArchiveLoading.java#coops_coh
 runtime/cds/TestDefaultArchiveLoading.java#nocoops_coh                          8348568 generic-all
 runtime/cds/appcds/TestZGCWithCDS.java                                          8348568 generic-all
 
-# Valhalla + AOT
-runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java                8366701 generic-all
-runtime/cds/appcds/aotCache/AOTLoggingTag.java                                  8366701 generic-all
-runtime/cds/appcds/aotCache/ClassPathLogging.java                               8366701 generic-all
-runtime/cds/appcds/aotCache/ExcludedClasses.java                                8366701 generic-all
-runtime/cds/appcds/aotCache/HelloAOTCache.java                                  8366701 generic-all
-runtime/cds/appcds/aotCache/JavaAgent.java                                      8366701 generic-all
-runtime/cds/appcds/aotCache/ManagementAgent.java                                8366701 generic-all
-runtime/cds/appcds/aotCache/PackageInfoClass.java                               8366701 generic-all
-runtime/cds/appcds/aotCache/SpecialCacheNames.java                              8366701 generic-all
-runtime/cds/appcds/aotCache/VerifierFailOver.java                               8366701 generic-all
-runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java                         8366701 generic-all
-runtime/cds/appcds/aotClassLinking/AOTLoaderConstraintsTest.java                8366701 generic-all
-runtime/cds/appcds/aotClassLinking/AddExports.java                              8366701 generic-all
-runtime/cds/appcds/aotClassLinking/AddOpens.java                                8366701 generic-all
-runtime/cds/appcds/aotClassLinking/AddReads.java                                8366701 generic-all
-runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java#aot                      8366701 generic-all
-runtime/cds/appcds/aotClassLinking/FakeCodeLocation.java                        8366701 generic-all
-runtime/cds/appcds/aotClassLinking/GeneratedInternedString.java                 8366701 generic-all
-runtime/cds/appcds/aotClassLinking/MethodHandleTest.java                        8366701 generic-all
-runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal.java               8366701 generic-all
-runtime/cds/appcds/aotClassLinking/StringConcatStress.java#aot                  8366701 generic-all
-runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.java                        8366701 generic-all
-runtime/cds/appcds/aotClassLinking/TrainingRun.java                             8366701 generic-all
-runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java                       8366701 generic-all
-runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java                       8366701 generic-all
-runtime/cds/appcds/aotCode/AOTCodeFlags.java                                    8366701 generic-all
-runtime/cds/appcds/aotFlags/AOTFlags.java                                       8366701 generic-all
-runtime/cds/appcds/aotFlags/FileNameSubstitution.java                           8366701 generic-all
-runtime/cds/appcds/aotFlags/JDK_AOT_VM_OPTIONS.java                             8366701 generic-all
-runtime/cds/appcds/aotProfile/AOTProfileFlags.java                              8366701 generic-all
-runtime/cds/appcds/applications/JavacBench.java#aot                             8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java#aot          8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java#aot          8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java#aot              8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesInvokersTest.java#aot             8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java#aot     8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java#aot      8366701 generic-all
-runtime/cds/appcds/aotClassLinking/StringConcatStress.java#aot                  8366701 generic-all
-runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.java                        8366701 generic-all
-runtime/cds/appcds/aotClassLinking/TrainingRun.java                             8366701 generic-all
-runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java                       8366701 generic-all
-runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java                       8366701 generic-all
-runtime/cds/appcds/aotCode/AOTCodeFlags.java                                    8366701 generic-all
-runtime/cds/appcds/aotFlags/AOTFlags.java                                       8366701 generic-all
-runtime/cds/appcds/aotFlags/FileNameSubstitution.java                           8366701 generic-all
-runtime/cds/appcds/aotFlags/JDK_AOT_VM_OPTIONS.java                             8366701 generic-all
-runtime/cds/appcds/aotProfile/AOTProfileFlags.java                              8366701 generic-all
-runtime/cds/appcds/applications/JavacBench.java#aot                             8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java#aot          8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java#aot          8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java#aot              8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesInvokersTest.java#aot             8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java#aot     8366701 generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java#aot      8366701 generic-all
-
 #############################################################################
 
 # :hotspot_serviceability

Original file line number	Diff line number	Diff line change
`@@ -1980,6 +1980,11 @@ class ArrayStoreData : public ReceiverTypeData {`
`1980`	`1980`	`_array.clean_weak_klass_links(always_clean);`
`1981`	`1981`	`}`
`1982`	`1982`
	`1983`	`+ virtual void metaspace_pointers_do(MetaspaceClosure* it) {`
	`1984`	`+ ReceiverTypeData::metaspace_pointers_do(it);`
	`1985`	`+ _array.metaspace_pointers_do(it);`
	`1986`	`+ }`
	`1987`	`+`
`1983`	`1988`	`static ByteSize array_store_data_size() {`
`1984`	`1989`	`return cell_offset(static_cell_count());`
`1985`	`1990`	`}`
`@@ -2053,6 +2058,11 @@ class ArrayLoadData : public ProfileData {`
`2053`	`2058`	`_element.clean_weak_klass_links(always_clean);`
`2054`	`2059`	`}`
`2055`	`2060`
	`2061`	`+ virtual void metaspace_pointers_do(MetaspaceClosure* it) {`
	`2062`	`+ _array.metaspace_pointers_do(it);`
	`2063`	`+ _element.metaspace_pointers_do(it);`
	`2064`	`+ }`
	`2065`	`+`
`2056`	`2066`	`static ByteSize array_load_data_size() {`
`2057`	`2067`	`return cell_offset(static_cell_count());`
`2058`	`2068`	`}`
`@@ -2126,6 +2136,11 @@ class ACmpData : public BranchData {`
`2126`	`2136`	`_right.clean_weak_klass_links(always_clean);`
`2127`	`2137`	`}`
`2128`	`2138`
	`2139`	`+ virtual void metaspace_pointers_do(MetaspaceClosure* it) {`
	`2140`	`+ _left.metaspace_pointers_do(it);`
	`2141`	`+ _right.metaspace_pointers_do(it);`
	`2142`	`+ }`
	`2143`	`+`
`2129`	`2144`	`static ByteSize acmp_data_size() {`
`2130`	`2145`	`return cell_offset(static_cell_count());`
`2131`	`2146`	`}`