From 8c8d21db6f5bdc35f6eddf91065b4eec462a716f Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 9 Dec 2025 16:10:13 +0000
Subject: [PATCH] 8373295: Wrong log tag for UseCompressedOops ergo setting

Reviewed-by: dholmes, ysuenaga
---
 src/hotspot/share/runtime/arguments.cpp       |  8 +-
 .../appcds/sharedStrings/SysDictCrash.java    | 84 -------------------
 2 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 4a983095593..dab3a60c650 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1604,10 +1604,10 @@ void Arguments::set_heap_size() {
       // and UseCompressedOops was not specified.
       if (reasonable_max > max_coop_heap) {
         if (FLAG_IS_ERGO(UseCompressedOops) && has_ram_limit) {
-          aot_log_info(aot)("UseCompressedOops disabled due to "
-                            "max heap %zu > compressed oop heap %zu. "
-                            "Please check the setting of MaxRAMPercentage %5.2f.",
-                            reasonable_max, (size_t)max_coop_heap, MaxRAMPercentage);
+          log_debug(gc, heap, coops)("UseCompressedOops disabled due to "
+                                     "max heap %zu > compressed oop heap %zu. "
+                                     "Please check the setting of MaxRAMPercentage %5.2f.",
+                                     reasonable_max, (size_t)max_coop_heap, MaxRAMPercentage);
           FLAG_SET_ERGO(UseCompressedOops, false);
         } else {
           reasonable_max = max_coop_heap;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
deleted file mode 100644
index 9462f4f9d0b..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2015, 2025, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test
- * @summary Regression test for JDK-8098821
- * @bug 8098821
- * @requires vm.cds.write.archived.java.heap
- * @requires vm.gc == null
- * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @run driver SysDictCrash
- */
-
-import jdk.test.lib.cds.CDSOptions;
-import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class SysDictCrash {
-    public static void main(String[] args) throws Exception {
-        SharedStringsUtils.run(args, SysDictCrash::test);
-    }
-
-    public static void test(String[] args) throws Exception {
-        String vmOptionsPrefix[] = SharedStringsUtils.getChildVMOptionsPrefix();
-
-        // SharedBaseAddress=0 puts the archive at a very high address, which provokes the crash.
-        boolean continueTest = true;
-
-        CDSOptions opts = (new CDSOptions())
-            .addPrefix(vmOptionsPrefix,
-                       "-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5",
-                       "-cp", ".",
-                       "-XX:SharedBaseAddress=0",
-                       "-showversion", "-Xlog:cds,aot+hashtables")
-            .setArchiveName("./SysDictCrash.jsa");
-        OutputAnalyzer output = CDSTestUtils.createArchive(opts);
-        try {
-            TestCommon.checkDump(output);
-        } catch (java.lang.RuntimeException re) {
-            if (!output.getStdout().contains("UseCompressedOops disabled due to")) {
-                throw re;
-            } else {
-                System.out.println("Shared archive was not created due to UseCompressedOops and UseCompressedClassPointers have been disabled.");
-                continueTest = false;
-            }
-        }
-
-        if (!continueTest) {
-            return;
-        }
-
-        opts = (new CDSOptions())
-            .setArchiveName("./SysDictCrash.jsa") // prevents the assignment of a default archive name
-            .setUseVersion(false) // the -version must be the last arg for this test to work
-            .addSuffix(vmOptionsPrefix,
-                       "-Xlog:cds",
-                       "-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5",
-                       "-XX:SharedArchiveFile=./SysDictCrash.jsa",
-                       "-version");
-        CDSTestUtils.run(opts)
-                    .assertNormalExit();
-    }
-}