From 6f6d129bff7141cc4530f4723ffbae39e898a580 Mon Sep 17 00:00:00 2001
From: JohnTortugo <dcsl@amazon.com>
Date: Thu, 12 Jun 2025 20:14:49 +0000
Subject: [PATCH] Fix some remaining renames.

---
 .../classes/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java | 6 +++---
 .../share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java     | 6 +++---
 .../jdk/vm/ci/hotspot/CompilerToVMHelper.java               | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
index 5ae595ba40c..9545c9aa9ec 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
@@ -165,7 +165,7 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
 
     @Override
     public void invalidateInstalledCode(InstalledCode installedCode) {
-        invalidateInstalledCode(installedCode, unknownInvalidationReason());
+        invalidateInstalledCode(installedCode, jvmciInvalidationReason());
     }
 
     @Override
@@ -206,7 +206,7 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
         runtime.getCompilerToVM().resetCompilationStatistics();
     }
 
-    private static int unknownInvalidationReason() {
-        return HotSpotJVMCIRuntime.runtime().config.getConstant("nmethod::ChangeReason::Unknown", Integer.class);
+    private static int jvmciInvalidationReason() {
+        return HotSpotJVMCIRuntime.runtime().config.getConstant("nmethod::InvalidationReason::JVMCI_INVALIDATE", Integer.class);
     }
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java
index 6e29f7e14e2..5c7089da6cb 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java
@@ -142,7 +142,7 @@ public class HotSpotNmethod extends HotSpotInstalledCode {
 
     @Override
     public void invalidate(boolean deoptimize) {
-        invalidate(deoptimize, unknownInvalidationReason());
+        invalidate(deoptimize, jvmciInvalidationReason());
     }
 
     @Override
@@ -221,7 +221,7 @@ public class HotSpotNmethod extends HotSpotInstalledCode {
         return compilerToVM().getInvalidationReasonDescription(this.getInvalidationReason());
     }
 
-    private static int unknownInvalidationReason() {
-        return HotSpotJVMCIRuntime.runtime().config.getConstant("nmethod::ChangeReason::Unknown", Integer.class);
+    private static int jvmciInvalidationReason() {
+        return HotSpotJVMCIRuntime.runtime().config.getConstant("nmethod::InvalidationReason::JVMCI_INVALIDATE", Integer.class);
     }
 }
diff --git a/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
index c76eeb12563..4c8e63d0a42 100644
--- a/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
+++ b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
@@ -229,8 +229,8 @@ public class CompilerToVMHelper {
         CTVM.reprofile((HotSpotResolvedJavaMethodImpl)method);
     }
 
-    public static void invalidateHotSpotNmethod(HotSpotNmethod nmethodMirror, boolean deoptimize, int changeReason) {
-        CTVM.invalidateHotSpotNmethod(nmethodMirror, deoptimize, changeReason);
+    public static void invalidateHotSpotNmethod(HotSpotNmethod nmethodMirror, boolean deoptimize, int invalidationReason) {
+        CTVM.invalidateHotSpotNmethod(nmethodMirror, deoptimize, invalidationReason);
     }
 
     public static long[] collectCounters() {