From c4adf3680de5696d0e44bbeeddee61816fe8e7aa Mon Sep 17 00:00:00 2001
From: tstuefe <thomas.stuefe@gmail.com>
Date: Mon, 17 Nov 2025 16:02:40 +0100
Subject: [PATCH] 
 test/hotspot/jtreg/runtime/FieldLayout/TestOopMapSizeMinimal.java

---
 .../FieldLayout/TestOopMapSizeMinimal.java    | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/FieldLayout/TestOopMapSizeMinimal.java b/test/hotspot/jtreg/runtime/FieldLayout/TestOopMapSizeMinimal.java
index 66a2a90cfcf..6d22c1302f3 100644
--- a/test/hotspot/jtreg/runtime/FieldLayout/TestOopMapSizeMinimal.java
+++ b/test/hotspot/jtreg/runtime/FieldLayout/TestOopMapSizeMinimal.java
@@ -30,47 +30,27 @@ import java.util.ArrayList;
 import java.util.List;
 
 /*
- * @test id=no_coops_no_ccptr_no_coh
+ * @test id=no_coops_no_coh
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:-USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE -XX:-UseCompactObjectHeaders TestOopMapSizeMinimal
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:-UseCompactObjectHeaders TestOopMapSizeMinimal
  */
 
 /*
- * @test id=coops_no_ccptr_no_coh
+ * @test id=coops_no_coh
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:-USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE -XX:-UseCompactObjectHeaders TestOopMapSizeMinimal
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:-UseCompactObjectHeaders TestOopMapSizeMinimal
  */
 
 /*
- * @test id=no_coops_ccptr_no_coh
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:+USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE -XX:-UseCompactObjectHeaders TestOopMapSizeMinimal
- */
-
-/*
- * @test id=coops_ccptr_no_coh
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:+USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE -XX:-UseCompactObjectHeaders TestOopMapSizeMinimal
- */
-
-/*
- * @test id=no_coops_ccptr_coh
+ * @test id=no_coops_coh
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -79,6 +59,16 @@ import java.util.List;
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:+UseCompactObjectHeaders TestOopMapSizeMinimal
  */
 
+/*
+ * @test id=coops_coh
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:+UseCompactObjectHeaders TestOopMapSizeMinimal
+ */
+
 public class TestOopMapSizeMinimal {
 
     public static int OOP_SIZE_IN_BYTES = -1;
@@ -99,10 +89,8 @@ public class TestOopMapSizeMinimal {
         if (is_64_bit) {
             if (WB.getBooleanVMFlag("UseCompactObjectHeaders")) {
                 HEADER_SIZE_IN_BYTES = 8;
-            } else if (WB.getBooleanVMFlag("USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE")) {
-                HEADER_SIZE_IN_BYTES = 12;
             } else {
-                HEADER_SIZE_IN_BYTES = 16;
+                HEADER_SIZE_IN_BYTES = 12;
             }
         } else {
             HEADER_SIZE_IN_BYTES = 8;