Skip to content

8361569: [JVMCI] Further refine JVMCI-compiled nmethod that should not collect deoptimization profile #26192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

8361569: [JVMCI] Further refine JVMCI-compiled nmethod that should not collect deoptimization profile #26192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
53c9279
[JVMCI] Further refine JVMCI-compiled nmethod that should not collect…
mur47x111 Jul 8, 2025
b17efc6
restore HotSpotNmethod constructor
mur47x111 Jul 8, 2025
c0afd3c
JNIJVMCI::HotSpotNmethod::constructor() cannot be overloaded
mur47x111 Jul 8, 2025
3f7b236
fix compilation error in test
mur47x111 Jul 9, 2025
b67bd1b
fix compilation error, update copyright year
mur47x111 Jul 9, 2025
ca92354
fix method not found in truffle tests
mur47x111 Jul 9, 2025
d3abc23
update signature
mur47x111 Jul 9, 2025
413c1f3
Merge remote-tracking branch 'upstream/master' into JDK-8361569
mur47x111 Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/hotspot/share/jvmci/jvmciJavaClasses.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
long_field(HotSpotNmethod, compileIdSnapshot) \
object_field(HotSpotNmethod, method, "Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;") \
int_field(HotSpotNmethod, invalidationReason) \
jvmci_constructor(HotSpotNmethod, "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;Ljava/lang/String;ZJ)V") \
jvmci_constructor(HotSpotNmethod, "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;Ljava/lang/String;ZZJ)V") \
end_class \
start_class(HotSpotCompiledCode, jdk_vm_ci_hotspot_HotSpotCompiledCode) \
Expand Down
4 changes: 0 additions & 4 deletions src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotNmethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ boolean inOopsTable() {
*/
private int invalidationReason;

HotSpotNmethod(HotSpotResolvedJavaMethodImpl method, String name, boolean isDefault, long compileId) {
this(method, name, isDefault, isDefault, compileId);
}

HotSpotNmethod(HotSpotResolvedJavaMethodImpl method, String name, boolean isDefault, boolean profileDeopt, long compileId) {
super(name);
this.method = method;
Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/compiler/jvmci/common/CodeInstallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected InstalledCode installEmptyCode(Site[] sites,
hasUnsafeAccess);
SpeculationLog log = null;
InstalledCode installedCode = null;
return codeCache.addCode(dummyMethod, code, log, installedCode);
return codeCache.addCode(dummyMethod, code, log, installedCode, true);
}

protected Register getRegister(PlatformKind kind, int index) {
Expand Down
2 changes: 1 addition & 1 deletion ...ompiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ public static InstalledCode getInstalledCode(ResolvedJavaMethod method, String n
}
private static class InstalledCodeStub extends HotSpotNmethod {
private InstalledCodeStub(HotSpotResolvedJavaMethodImpl method, String name, long address, long entryPoint) {
super(method, name, false, 0);
super(method, name, false, 0, true);
this.address = address;
this.entryPoint = entryPoint;
}
Expand Down
2 changes: 1 addition & 1 deletion ...treg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ protected HotSpotNmethod test(TestCompiler compiler, Method method, Object... ar
asm.emitEpilogue();

HotSpotCompiledCode code = asm.finish(resolvedMethod);
InstalledCode installed = codeCache.addCode(resolvedMethod, code, null, null);
InstalledCode installed = codeCache.addCode(resolvedMethod, code, null, null, true);

if (DEBUG) {
String str = ((HotSpotCodeCacheProvider) codeCache).disassemble(installed);
Expand Down