8292635: Run ArchivedEnumTest.java in jdk tier testing

Reviewed-by: iklam, dholmes
openjdk · Jan 19, 2023 · 910dffe · 910dffe · openjdk-notifier · Jan 19, 2023
1 parent fc9f8ba
commit 910dffe
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, 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
@@ -308,11 +308,9 @@ int CDSHeapVerifier::trace_to_root(outputStream* st, oop orig_obj, oop orig_fiel
   return level;
 }
 
-#ifdef ASSERT
 void CDSHeapVerifier::verify() {
   CDSHeapVerifier verf;
   HeapShared::archived_object_cache()->iterate(&verf);
 }
-#endif
 
 #endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.hpp b/src/hotspot/share/cds/cdsHeapVerifier.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, 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
@@ -82,7 +82,7 @@ class CDSHeapVerifier : public KlassClosure {
   // For ResourceHashtable::iterate()
   inline bool do_entry(oop& orig_obj, HeapShared::CachedOopInfo& value);
 
-  static void verify() NOT_DEBUG_RETURN;
+  static void verify();
 
   static void trace_to_root(outputStream* st, oop orig_obj);
 };

diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
@@ -60,6 +60,7 @@ requires.properties= \
     vm.compiler1.enabled \
     vm.compiler2.enabled \
     vm.cds \
+    vm.cds.write.archived.java.heap \
     vm.continuations \
     vm.musl \
     vm.debug \

diff --git a/...s/appcds/cacheObject/ArchivedEnumApp.java → ...dk/internal/misc/CDS/ArchivedEnumApp.java b/...s/appcds/cacheObject/ArchivedEnumApp.java → ...dk/internal/misc/CDS/ArchivedEnumApp.java
diff --git a/.../appcds/cacheObject/ArchivedEnumTest.java → ...k/internal/misc/CDS/ArchivedEnumTest.java b/.../appcds/cacheObject/ArchivedEnumTest.java → ...k/internal/misc/CDS/ArchivedEnumTest.java