From c3a85cd4d1ba7babbd554503d05bb0b299bc9073 Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <saranya.natarajan@oracle.com>
Date: Wed, 23 Jul 2025 11:02:08 +0000
Subject: [PATCH] fixing test failures due to intx -> int of BciProfileWidth

---
 src/hotspot/share/cds/filemap.cpp                               | 2 +-
 src/hotspot/share/cds/filemap.hpp                               | 2 +-
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp               | 2 +-
 .../share/classes/sun/jvm/hotspot/oops/MethodData.java          | 2 +-
 test/lib-test/jdk/test/whitebox/vm_flags/IntxTest.java          | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 35b46099e1b..2f0fd1b9109 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1985,7 +1985,7 @@ bool FileMapHeader::validate() {
     if (_bci_profile_width != BciProfileWidth) {
       MetaspaceShared::report_loading_error("The %s's BciProfileWidth setting (%d)"
                                             " does not equal the current BciProfileWidth setting (%d).", file_type,
-                                            (int)_bci_profile_width, (int)BciProfileWidth);
+                                            _bci_profile_width, BciProfileWidth);
       return false;
     }
     if (_type_profile_casts != TypeProfileCasts) {
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 02390874f39..540ae8b3f93 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -152,7 +152,7 @@ private:
   int     _type_profile_args_limit;
   int     _type_profile_parms_limit;
   intx    _type_profile_width;
-  intx    _bci_profile_width;
+  int     _bci_profile_width;
   bool    _profile_traps;
   bool    _type_profile_casts;
   int     _spec_trap_limit_extra_entries;
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index b6d919fdfe9..52a0b3f1999 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -350,7 +350,7 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
   do_int_flag(AllocatePrefetchLines)                                       \
   do_int_flag(AllocatePrefetchStepSize)                                    \
   do_int_flag(AllocatePrefetchStyle)                                       \
-  do_intx_flag(BciProfileWidth)                                            \
+  do_int_flag(BciProfileWidth)                                            \
   do_bool_flag(BootstrapJVMCI)                                             \
   do_bool_flag(CITime)                                                     \
   do_bool_flag(CITimeEach)                                                 \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
index a7c2e2bccb7..f20370cc960 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
@@ -143,7 +143,7 @@ public class MethodData extends Metadata implements MethodDataInterface<Klass,Me
       if (flag.getName().equals("TypeProfileWidth")) {
         TypeProfileWidth = (int)flag.getIntx();
       } else if (flag.getName().equals("BciProfileWidth")) {
-        BciProfileWidth = (int)flag.getIntx();
+        BciProfileWidth = (int)flag.getInt();
       } else if (flag.getName().equals("CompileThreshold")) {
         CompileThreshold = (int)flag.getIntx();
       }
diff --git a/test/lib-test/jdk/test/whitebox/vm_flags/IntxTest.java b/test/lib-test/jdk/test/whitebox/vm_flags/IntxTest.java
index 2de4028ba6c..00123f23b82 100644
--- a/test/lib-test/jdk/test/whitebox/vm_flags/IntxTest.java
+++ b/test/lib-test/jdk/test/whitebox/vm_flags/IntxTest.java
@@ -36,7 +36,6 @@
 import jdk.test.lib.Platform;
 public class IntxTest {
     private static final String FLAG_NAME = "OnStackReplacePercentage";
-    private static final String FLAG_DEBUG_NAME = "BciProfileWidth";
     private static final long COMPILE_THRESHOLD = VmFlagTest.WHITE_BOX.getIntxVMFlag("CompileThreshold");
     private static final Long[] TESTS = {0L, 100L, (long)(Integer.MAX_VALUE>>3)*100L};
 
@@ -45,7 +44,6 @@ public class IntxTest {
         VmFlagTest.runTest(FLAG_NAME, TESTS,
             VmFlagTest.WHITE_BOX::setIntxVMFlag,
             VmFlagTest.WHITE_BOX::getIntxVMFlag);
-        VmFlagTest.runTest(FLAG_DEBUG_NAME, VmFlagTest.WHITE_BOX::getIntxVMFlag);
     }
 
     static void find_and_set_max_osrp() {