-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8370248: AOTMapLogger should check if pointer is in AOTMetaspace #27918
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
8370248: AOTMapLogger should check if pointer is in AOTMetaspace #27918
Conversation
|
👋 Welcome back iklam! A progress list of the required criteria for merging this PR into |
|
@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: 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 13 new commits pushed to the
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 |
vnkozlov
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good.
adinn
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
|
Going to push as commit 70e7861.
Your commit was automatically rebased without conflicts. |
This fixes a recent bug in
AOTMapLoggerthat's exposed in macOS 26 testing.When running the JVM with a valid AOT cache (or AOT cache) with the flag
-Xlog:aot+map=debug, we useAOTMapLogger::RuntimeGatherArchivedMetaspaceObjsto discover all metaspace objects that are contained in the AOT cache.However, this code is executed after some of the AOT-cached classes are linked. As a result,
RuntimeGatherArchivedMetaspaceObjs::do_unique_ref()could see instances ofAdapterHandlerEntrywhich are dynamically allocated and their addresses are outside of the AOT cache.In all platforms except macOS 26, the
AdapterHandlerEntrypointers are all above the address range of the AOT cache, and they are filtered out by subsequent code inAOTMapLogger. However, on macOS 26, theAdapterHandlerEntrypointers are below the AOT cache, and they caused this assert to fail:jdk/src/hotspot/share/cds/aotMapLogger.cpp
Lines 240 to 242 in 9a88d7f
The fix is simple: filter out all pointers that are outside of the address range of the AOT cache in
do_unique_ref().Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/27918/head:pull/27918$ git checkout pull/27918Update a local copy of the PR:
$ git checkout pull/27918$ git pull https://git.openjdk.org/jdk.git pull/27918/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 27918View PR using the GUI difftool:
$ git pr show -t 27918Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27918.diff
Using Webrev
Link to Webrev Comment