From 964aac28fe4a33f9e86cc07895a7ff4cdbaec3e6 Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Fri, 19 Aug 2022 03:04:08 +0000 Subject: [PATCH] 8292499: CDS ArchivedEnumTest.java fails: object points to a static field that may be reinitialized Reviewed-by: dholmes, ccheung --- src/hotspot/share/cds/cdsHeapVerifier.cpp | 4 ++++ test/hotspot/jtreg/ProblemList.txt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp index 1eff9116901..849ce6f14d4 100644 --- a/src/hotspot/share/cds/cdsHeapVerifier.cpp +++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp @@ -101,6 +101,10 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0) "ALL_UNNAMED_MODULE_SET", // A "EVERYONE_MODULE", // A "EVERYONE_SET"); // A + + // This is the same as java/util/ImmutableCollections::EMPTY_SET, which is archived + ADD_EXCL("java/lang/reflect/AccessFlag$Location", "EMPTY_SET"); // E + ADD_EXCL("java/lang/System", "bootLayer"); // A ADD_EXCL("java/lang/VersionProps", "VENDOR_URL_BUG", // C "VENDOR_URL_VM_BUG", // C diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 14037a6bc63..0bb3b09f9bb 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -102,8 +102,6 @@ applications/jcstress/copy.java 8229852 linux-all containers/docker/TestJcmd.java 8278102 linux-all -runtime/cds/appcds/cacheObject/ArchivedEnumTest.java 8292499 generic-all - ############################################################################# # :hotspot_serviceability