Skip to content

8351319: AOT cache support for custom class loaders broken since JDK-8348426 #23926

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.

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

Conversation

iklam
Copy link
Member

@iklam iklam commented Mar 6, 2025

Since JDK-8348426 (Generate binary file for -XX:AOTMode=record -XX:AOTConfiguration=file), the AOT cache no longer contains classes intended for custom class loaders (these are called "unregistered classes" in CDS terminology).

The fix is simple -- we already remember the set of unregistered classes in the AOT configuration file. We just need to add them into the final AOT cache (see changes in finalImageRecipes.cpp).


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-8351319: AOT cache support for custom class loaders broken since JDK-8348426 (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23926

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 6, 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 Mar 6, 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:

8351319: AOT cache support for custom class loaders broken since JDK-8348426

Reviewed-by: ccheung, matsaave, jrose

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

  • 5f2a604: 8353840: JNativeScan should not abort for missing classes
  • 1f21da7: 8351462: Improve robustness of String concatenation

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 Mar 6, 2025
@openjdk
Copy link

openjdk bot commented Mar 6, 2025

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

  • hotspot

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.

@mlbridge
Copy link

mlbridge bot commented Mar 6, 2025

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 3, 2025

@iklam This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

LGTM

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

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

LGTM!

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 4, 2025
Copy link
Contributor

@rose00 rose00 left a comment

Choose a reason for hiding this comment

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

Good.

I suppose there already tests for the other end of the process, where an unregistered class in the AOT cache is actually used. What are those tests?

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

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

Changes look good!

…d from cache; (2) cp->resolved_reference_length() was not set correctly
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 8, 2025
@iklam
Copy link
Member Author

iklam commented Apr 8, 2025

Good.

I suppose there already tests for the other end of the process, where an unregistered class in the AOT cache is actually used. What are those tests?

It turns out that the existing tests only check for unregistered classes in the classical CDS archive. I added a test in BulkLoaderTest.java to check the AOT cache and found a bug. Fixed in c02a611

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Updates look good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 9, 2025
@iklam
Copy link
Member Author

iklam commented Apr 9, 2025

Thanks @calvinccheung @matias9927 @rose00 for the review
/integrate

@openjdk
Copy link

openjdk bot commented Apr 9, 2025

Going to push as commit e3f26b0.
Since your change was applied there have been 8 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 Apr 9, 2025
@openjdk openjdk bot closed this Apr 9, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 9, 2025
@openjdk
Copy link

openjdk bot commented Apr 9, 2025

@iklam Pushed as commit e3f26b0.

💡 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 [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants