Skip to content

Conversation

@iklam
Copy link
Member

@iklam iklam commented Jun 12, 2025

AOTLinkedClassBulkLoader::finish_loading_javabase_classes() can execute Java bytecodes (from <clinit>). If one of these bytecodes is an AOT-resolved invokedynamic, it may be dispatched using an archived method handle intrinsic. Therefore, we should call SystemDictionary::restore_archived_method_handle_intrinsics() first to make sure that the method handle intrinsics are ready to be used.

In the JDK mainline, we only execute a very limited set of Java methods which happens to not include any invokedynamic bytecodes. That's why this bug has not been found in the mainline.

However, in the Leyden repo, we have other optimizations, such as archived ProtectionDomains, which will cause invokedynamic bytecodes to be executed inside AOTLinkedClassBulkLoader::finish_loading_javabase_classes().

Since this is a potential issue even for the JDK mainline, we should fix it (and also backport to JDK 25).

Thanks to @iwanowww for providing the fix!


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-8355556: JVM crash because archived method handle intrinsics are not restored (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25766

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 12, 2025

👋 Welcome back iklam! 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
Copy link

openjdk bot commented Jun 12, 2025

@iklam 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:

8355556: JVM crash because archived method handle intrinsics are not restored

Reviewed-by: adinn, vlivanov, shade

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 36 new commits pushed to the master branch:

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 openjdk bot added the rfr Pull request is ready for review label Jun 12, 2025
@openjdk
Copy link

openjdk bot commented Jun 12, 2025

@iklam The following label will be automatically applied to this pull request:

  • hotspot-runtime

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

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 12, 2025
@mlbridge
Copy link

mlbridge bot commented Jun 12, 2025

Webrevs

Copy link
Contributor

@adinn adinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 12, 2025
Copy link
Contributor

@iwanowww iwanowww left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@iklam
Copy link
Member Author

iklam commented Jun 13, 2025

Thanks @adinn @iwanowww @shipilev for the review
/integrate

@openjdk
Copy link

openjdk bot commented Jun 13, 2025

Going to push as commit 366650a.
Since your change was applied there have been 44 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 13, 2025
@openjdk openjdk bot closed this Jun 13, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 13, 2025
@openjdk
Copy link

openjdk bot commented Jun 13, 2025

@iklam Pushed as commit 366650a.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants