1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some remaining renames.

Browse Source
This commit is contained in:
JohnTortugo 2025-06-12 20:14:49 +00:00
parent 831ba2f02e
commit 6f6d129bff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
View File

@ -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);
}
}

6
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java
View File

@ -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);
}
}

4
test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
View File

@ -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() {