From 42f32551cd2aaa4b7609cc887cb33fc58ac12779 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 4 Oct 2024 16:14:51 +0000
Subject: [PATCH] 8341053: Two CDS tests fail again with -UseCompressedOops and
 UseSerialGC/UseParallelGC

Reviewed-by: iklam, matsaave
---
 src/hotspot/share/prims/whitebox.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index ca440b69913..24f6156224d 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -2159,7 +2159,8 @@ WB_ENTRY(jboolean, WB_IsJVMCISupportedByGC(JNIEnv* env))
 WB_END
 
 WB_ENTRY(jboolean, WB_CanWriteJavaHeapArchive(JNIEnv* env))
-  return HeapShared::can_write();
+  return HeapShared::can_write()
+      && ArchiveHeapLoader::can_use(); // work-around JDK-8341371
 WB_END