From 7bdfce0b642447580ad3da2c4d7fb3abd95a9a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCbner?= Date: Tue, 17 Mar 2026 10:58:44 +0100 Subject: [PATCH 1/4] Constrain hasSA to non-preview configurations. --- test/jtreg-ext/requires/VMProps.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 4a1ac42fdf3..202b42b9b68 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 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 @@ -418,7 +418,9 @@ protected void vmOptFinalIntxFlags(SafeMap map) { * @return "true" if VM has a serviceability agent. */ protected String vmHasSA() { - return "" + Platform.hasSA(); + // SA is not enabled for the Valhalla preview, + boolean isPreview = PreviewFeatures.isEnabled(); + return "" + (Platform.hasSA() && !isPreview); } /** From 51d4356be885e35aca88fe79eedd864024ad8fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCbner?= Date: Tue, 24 Mar 2026 09:51:38 +0100 Subject: [PATCH 2/4] Revert "Constrain hasSA to non-preview configurations." This reverts commit 7bdfce0b642447580ad3da2c4d7fb3abd95a9a8c. --- test/jtreg-ext/requires/VMProps.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 202b42b9b68..4a1ac42fdf3 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -418,9 +418,7 @@ protected void vmOptFinalIntxFlags(SafeMap map) { * @return "true" if VM has a serviceability agent. */ protected String vmHasSA() { - // SA is not enabled for the Valhalla preview, - boolean isPreview = PreviewFeatures.isEnabled(); - return "" + (Platform.hasSA() && !isPreview); + return "" + Platform.hasSA(); } /** From 9fd6dda3bbe0fddab6fd8103e4264746883d7892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCbner?= Date: Tue, 24 Mar 2026 12:30:04 +0100 Subject: [PATCH 3/4] Add tests to the problem list. --- test/hotspot/jtreg/ProblemList-enable-preview.txt | 8 +++++++- test/jdk/ProblemList-enable-preview.txt | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/ProblemList-enable-preview.txt b/test/hotspot/jtreg/ProblemList-enable-preview.txt index caed1d5edbd..06564bedcae 100644 --- a/test/hotspot/jtreg/ProblemList-enable-preview.txt +++ b/test/hotspot/jtreg/ProblemList-enable-preview.txt @@ -40,5 +40,11 @@ compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJav # Serviceability: vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java 8375069 generic-all - +resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java 8380769 generic-all +serviceability/sa/CDSJMapClstats.java 8380779 generic-all +serviceability/sa/ClhsdbDumpheap.java 8380779 generic-all +serviceability/sa/ClhsdbJhisto.java 8380779 generic-all +serviceability/sa/ClhsdbJstackWithConcurrentLock.java 8380779 generic-all serviceability/sa/TestHeapDumpForInvokeDynamic.java 8377387 generic-all +serviceability/sa/TestJmapCore.java 8380779 generic-all +serviceability/sa/TestJmapCoreMetaspace.java 8380779 generic-all diff --git a/test/jdk/ProblemList-enable-preview.txt b/test/jdk/ProblemList-enable-preview.txt index 5345d4b2e90..e21a4b2b75d 100644 --- a/test/jdk/ProblemList-enable-preview.txt +++ b/test/jdk/ProblemList-enable-preview.txt @@ -33,3 +33,7 @@ # Valhalla failures start here: com/sun/jdi/EATests.java#id0 8372831 generic-all java/lang/Thread/virtual/stress/Skynet.java#Z 8342977 generic-all + +sun/tools/jhsdb/HeapDumpTest.java 8379925 generic-all +sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8379925 generic-all +sun/tools/jhsdb/JShellHeapDumpTest.java 8379925 generic-all From 773b58d90878be907910c92eadddadb3e2c66069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCbner?= Date: Fri, 27 Mar 2026 10:47:54 +0100 Subject: [PATCH 4/4] Reviewer feedback. --- test/hotspot/jtreg/ProblemList-enable-preview.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/hotspot/jtreg/ProblemList-enable-preview.txt b/test/hotspot/jtreg/ProblemList-enable-preview.txt index 06564bedcae..a07d006a474 100644 --- a/test/hotspot/jtreg/ProblemList-enable-preview.txt +++ b/test/hotspot/jtreg/ProblemList-enable-preview.txt @@ -40,11 +40,7 @@ compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJav # Serviceability: vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java 8375069 generic-all -resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java 8380769 generic-all -serviceability/sa/CDSJMapClstats.java 8380779 generic-all -serviceability/sa/ClhsdbDumpheap.java 8380779 generic-all -serviceability/sa/ClhsdbJhisto.java 8380779 generic-all -serviceability/sa/ClhsdbJstackWithConcurrentLock.java 8380779 generic-all +serviceability/sa/ClhsdbDumpheap.java 8379925 generic-all serviceability/sa/TestHeapDumpForInvokeDynamic.java 8377387 generic-all -serviceability/sa/TestJmapCore.java 8380779 generic-all -serviceability/sa/TestJmapCoreMetaspace.java 8380779 generic-all +serviceability/sa/TestJmapCore.java 8379925 generic-all +serviceability/sa/TestJmapCoreMetaspace.java 8379925 generic-all