From 5eee32d04b6f4c4bf0de78c295d6d6feab523ea3 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 31 Mar 2025 20:43:21 +0000
Subject: [PATCH] 8352768: CDS test MethodHandleTest.java failed in -Xcomp mode

Reviewed-by: dholmes, shade, vlivanov
---
 src/hotspot/share/cds/aotClassInitializer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 28e20acdc79..297f8109eb4 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -303,6 +303,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
       {"java/lang/invoke/MethodHandles"},
       {"java/lang/invoke/SimpleMethodHandle"},
       {"java/lang/invoke/StringConcatFactory"},
+      {"java/lang/invoke/VarHandleGuards"},
       {"java/util/Collections"},
       {"java/util/stream/Collectors"},
       {"jdk/internal/constant/ConstantUtils"},