From 00a77704b00eb4a4d4356695329fb0e247bb3028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Arias=20de=20Reyna=20Dom=C3=ADnguez?=
 <mariasde@openjdk.org>
Date: Wed, 18 Mar 2026 14:26:48 +0000
Subject: [PATCH] 8380292: Confusing "reverted *" messages during training

Reviewed-by: adinn, asmehra
---
 src/hotspot/share/oops/constantPool.cpp | 2 +-
 src/hotspot/share/oops/cpCache.cpp      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 456333efad0..8d817178d1a 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -564,7 +564,7 @@ void ConstantPool::remove_resolved_klass_if_non_deterministic(int cp_index) {
   }
 
   LogStreamHandle(Trace, aot, resolve) log;
-  if (log.is_enabled()) {
+  if (log.is_enabled() && !CDSConfig::is_dumping_preimage_static_archive()) {
     ResourceMark rm;
     log.print("%s klass  CP entry [%3d]: %s %s",
               (can_archive ? "archived" : "reverted"),
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index edb5f6714c0..4177e4601ef 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -450,7 +450,7 @@ void ConstantPoolCache::remove_resolved_field_entries_if_non_deterministic() {
       Symbol* klass_name = cp->klass_name_at(klass_cp_index);
       Symbol* name = cp->uncached_name_ref_at(cp_index);
       Symbol* signature = cp->uncached_signature_ref_at(cp_index);
-      if (resolved) {
+      if (resolved && !CDSConfig::is_dumping_preimage_static_archive()) {
         log.print("%s field  CP entry [%3d]: %s => %s.%s:%s%s%s",
                   (archived ? "archived" : "reverted"),
                   cp_index,
@@ -493,7 +493,7 @@ void ConstantPoolCache::remove_resolved_method_entries_if_non_deterministic() {
       Symbol* name = cp->uncached_name_ref_at(cp_index);
       Symbol* signature = cp->uncached_signature_ref_at(cp_index);
       LogStream ls(lt);
-      if (resolved) {
+      if (resolved && !CDSConfig::is_dumping_preimage_static_archive()) {
         ls.print("%s%s method CP entry [%3d]: %s %s.%s:%s",
                 (archived ? "archived" : "reverted"),
                 (rme->is_resolved(Bytecodes::_invokeinterface) ? " interface" : ""),
@@ -539,7 +539,7 @@ void ConstantPoolCache::remove_resolved_indy_entries_if_non_deterministic() {
       Symbol* bsm_name = cp->uncached_name_ref_at(bsm_ref);
       Symbol* bsm_signature = cp->uncached_signature_ref_at(bsm_ref);
       Symbol* bsm_klass = cp->klass_name_at(cp->uncached_klass_ref_index_at(bsm_ref));
-      if (resolved) {
+      if (resolved && !CDSConfig::is_dumping_preimage_static_archive()) {
         log.print("%s indy   CP entry [%3d]: %s (%d)",
                   (archived ? "archived" : "reverted"),
                   cp_index, cp->pool_holder()->name()->as_C_string(), i);