Skip to content
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

8290739: Simplify storage of dump-time class information #9634

Conversation

iklam
Copy link
Member

@iklam iklam commented Jul 25, 2022

Some code clean up in anticipation of future CDS development.

I moved the initialization of SystemDictionaryShared::_dumptime_table and SystemDictionaryShared::_dumptime_lambda_proxy_class_dictionary to VM bootstrap, so that:

  • We don't need to allocate these tables dynamically
  • We don't need to check if these tables exist when writing the archive

The current implementation guarantees that SystemDictionaryShared::_dumptime_table always contains a DumpTimeClassInfo for each InstanceKlass that's being considered for inclusion in the CDS archive. I simplified the old SystemDictionaryShared::find_or_allocate_info_for() API to

// Guaranteed to return non-NULL value for non-shared classes.
// k must not be a shared class.
DumpTimeClassInfo* SystemDictionaryShared::get_info(InstanceKlass* k)

For more details, please see JBS issue: JDK-8290739


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-8290739: Simplify storage of dump-time class information

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9634

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 25, 2022

👋 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 Jul 25, 2022

@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 Jul 25, 2022
@iklam iklam marked this pull request as ready for review July 25, 2022 22:56
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 25, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 25, 2022

Webrevs

… -> !_class_loading_may_happen to avoid double-negation in the code
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jul 26, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 26, 2022
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
Copy link

openjdk bot commented Jul 27, 2022

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

8290739: Simplify storage of dump-time class information

Reviewed-by: ccheung

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated label Jul 27, 2022
…refactor-sysdictshared-find-or-allocate-info
@iklam
Copy link
Member Author

iklam commented Jul 27, 2022

Thanks to @calvinccheung for the review.
Passed tiers 1-4
/integrate

@openjdk
Copy link

openjdk bot commented Jul 27, 2022

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

  • 16a1275: 8290943: Fix several IR test issues on SVE after JDK-8289801
  • c1a3347: 8291358: Fix the "overridding" typo
  • 37b08c7: 8237913: G1CollectedHeap::heap_region_containing shouldn't be a template

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 27, 2022

@iklam Pushed as commit bc6a3c7.

💡 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.

2 participants