8362306: HotSpotJVMCIRuntime.getMirror can crash #26346

dougxc · 2025-07-16T08:35:10Z

This PR fixes HotSpotJVMCIRuntime.getMirror(ResolvedJavaMethod method) and HotSpotJVMCIRuntime.getMirror(ResolvedJavaField field) so that they return null for <clinit> and an injected field respectively instead of crashing.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8362306: HotSpotJVMCIRuntime.getMirror can crash (Bug - P4)

Reviewers

Gilles Duboscq (@gilles-duboscq - Committer)
Cesar Soares Lucas (@JohnTortugo - Committer) Review applies to fd44d95c
Tom Rodriguez (@tkrodriguez - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26346/head:pull/26346
$ git checkout pull/26346

Update a local copy of the PR:
$ git checkout pull/26346
$ git pull https://git.openjdk.org/jdk.git pull/26346/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26346

View PR using the GUI difftool:
$ git pr show -t 26346

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26346.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-07-16T08:35:57Z

👋 Welcome back dnsimon! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2025-07-16T08:36:48Z

@dougxc This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8362306: HotSpotJVMCIRuntime.getMirror can crash

Reviewed-by: gdub, never, cslucas

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 45 new commits pushed to the master branch:

5ed7277: 8361404: Parallel: Group all class unloading logc at the end of marking phase
dc08cf0: 8361697: Remove duplicate message in MainResources.properties
ea774b7: 8347052: Update java man page documentation to reflect current state of the UseNUMA flag
... and 42 more: https://git.openjdk.org/jdk/compare/9bef2d1610647dec18f9e81cbac3dddbbf99dd6d...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2025-07-16T08:37:18Z

@dougxc The following labels will be automatically applied to this pull request:

graal
hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2025-07-16T08:43:49Z

Webrevs

…fields

openjdk · 2025-07-16T08:45:50Z

@dougxc Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

gilles-duboscq · 2025-07-16T10:25:24Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

  return iklass;
 }

 C2V_VMENTRY_NULL(jobject, asReflectionField, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass), jint index))


There is the same pattern in getEncodedFieldAnnotationData, we should probably defend there as well.

Good point: c2c41aa

…annotation_data

gilles-duboscq · 2025-07-16T14:38:35Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

  CompilerThreadCanCallJava canCallJava(thread, true); // Requires Java support
  InstanceKlass* holder = InstanceKlass::cast(UNPACK_PAIR(Klass, klass));
-  return get_encoded_annotation_data(holder, holder->class_annotations(), true, filter_length, filter_klass_pointers, THREAD, JVMCIENV);
+  return get_encoded_annotation_data(holder, holder->class_annotations(), true, filter_length, filter_klass_pointers, THREAD, JVMCI_CHECK_NULL);


Can JVMCI_CHECK_ be used in return statements? i think the "check and return default value" part would be unreachable.

Indeed - I've been bitten by this before! In this case, it's harmless given that the return statement is anyway the last statement in the method. Still, I'll revert my "fix".
I'm also wondering (again?) why the C++ compiler does not warning about unreachable code.

…nt of method

gilles-duboscq · 2025-07-16T15:09:43Z

Maybe you could add a test in TestResolvedJavaType.getClassInitializer to check that getMirror doesn't crash on that and returns null?

dougxc · 2025-07-16T15:37:24Z

Maybe you could add a test in TestResolvedJavaType.getClassInitializer to check that getMirror doesn't crash on that and returns null?

Done: fd44d95

JohnTortugo

LGTM

tkrodriguez · 2025-07-17T14:34:18Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

  requireInHotSpot("asReflectionField", JVMCI_CHECK_NULL);
  Klass* klass = UNPACK_PAIR(Klass, klass);
-  InstanceKlass* iklass = check_field(klass, index, JVMCIENV);
+  InstanceKlass* iklass = check_field(klass, index, JVMCI_CHECK_NULL);


There's another copy of this idiom in getDeclaredFieldsInfo which might be worth fixing.

dougxc · 2025-07-17T16:18:30Z

Thanks for the reviews.

/integrate

openjdk · 2025-07-17T16:19:54Z

Going to push as commit 2b11a28.
Since your change was applied there have been 45 commits pushed to the master branch:

5ed7277: 8361404: Parallel: Group all class unloading logc at the end of marking phase
dc08cf0: 8361697: Remove duplicate message in MainResources.properties
ea774b7: 8347052: Update java man page documentation to reflect current state of the UseNUMA flag
... and 42 more: https://git.openjdk.org/jdk/compare/9bef2d1610647dec18f9e81cbac3dddbbf99dd6d...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-07-17T16:20:04Z

@dougxc Pushed as commit 2b11a28.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Jul 16, 2025

dougxc marked this pull request as ready for review July 16, 2025 08:40

openjdk bot added the rfr Pull request is ready for review label Jul 16, 2025

fixed bug in HotSpotJVMCIRuntime.getMirror for <clinit> and injected …

cca137a

…fields

dougxc force-pushed the JDK-8362306 branch from 8c44d9f to cca137a Compare July 16, 2025 08:45

gilles-duboscq reviewed Jul 16, 2025

View reviewed changes

dougxc added 2 commits July 16, 2025 13:53

moved inject field check into check_field for benefit of get_encoded_…

c2c41aa

…annotation_data

fixed bug in use of JVMCI traps

c76efe5

gilles-duboscq reviewed Jul 16, 2025

View reviewed changes

revert from JVMCI_CHECK_NULL back to JVMCIENV in final return stateme…

7cf4b26

…nt of method

test that getMirror on clinit returns null

fd44d95

gilles-duboscq approved these changes Jul 16, 2025

View reviewed changes

JohnTortugo approved these changes Jul 16, 2025

View reviewed changes

tkrodriguez reviewed Jul 17, 2025

View reviewed changes

tkrodriguez approved these changes Jul 17, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 17, 2025

replaced use of JVMCIENV with JVMCI_CHECK_NULL in getDeclaredFieldsInfo

d62c74d

openjdk bot removed the ready Pull request is ready to be integrated label Jul 17, 2025

gilles-duboscq approved these changes Jul 17, 2025

View reviewed changes

tkrodriguez approved these changes Jul 17, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 17, 2025

openjdk bot added the integrated Pull request has been integrated label Jul 17, 2025

openjdk bot closed this Jul 17, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 17, 2025

8362306: HotSpotJVMCIRuntime.getMirror can crash #26346

8362306: HotSpotJVMCIRuntime.getMirror can crash #26346

Uh oh!

Conversation

dougxc commented Jul 16, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Jul 16, 2025

Uh oh!

openjdk bot commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jul 16, 2025

Uh oh!

mlbridge bot commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

openjdk bot commented Jul 16, 2025

Uh oh!

gilles-duboscq Jul 16, 2025

Choose a reason for hiding this comment

Uh oh!

dougxc Jul 16, 2025

Choose a reason for hiding this comment

Uh oh!

gilles-duboscq Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dougxc Jul 16, 2025

Choose a reason for hiding this comment

Uh oh!

gilles-duboscq commented Jul 16, 2025

Uh oh!

dougxc commented Jul 16, 2025

Uh oh!

JohnTortugo left a comment

Choose a reason for hiding this comment

Uh oh!

tkrodriguez Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

dougxc commented Jul 17, 2025

Uh oh!

openjdk bot commented Jul 17, 2025

Uh oh!

openjdk bot commented Jul 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

dougxc commented Jul 16, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jul 16, 2025 •

edited

Loading

mlbridge bot commented Jul 16, 2025 •

edited

Loading

gilles-duboscq Jul 16, 2025 •

edited

Loading