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

8327651: Rename DictionaryEntry members related to protection domain #18222

Conversation

iklam
Copy link
Member

@iklam iklam commented Mar 12, 2024

Rename DictionaryEntry::_pd_set to _package_access_cache, and rename all related methods accordingly.

The old name was very confusing. It makes one wonder,

Is DictionaryEntry::_pd_set related to the java.lang.Class.getProtectionDomain() of the DictionaryEntry::_instance_klass in any way?

(Hint, they have absolutely no relationship to each other).

I am making this PR as future changes in the Leyden project may be touching this area. I don't want the reviewers of my future PRs be confused by this code.


This PR is mostly name changes and comment clarification.

Other than a log message change for clarification, there are no behavioral changes in this PR.


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-8327651: Rename DictionaryEntry members related to protection domain (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18222

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

Using diff file

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

Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 12, 2024

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

openjdk bot commented Mar 12, 2024

@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 Mar 12, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 12, 2024

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Other than deleting the useful comment, the renaming seems ok.

//
// The usage of the PD set can be seen in SystemDictionary::validate_protection_domain()
// It is essentially a cache to avoid repeated Java up-calls to
// ClassLoader.checkPackageAccess().
Copy link
Contributor

Choose a reason for hiding this comment

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

This was a pretty helpful comment, especially that we're trying to avoid repeated Java upcalls. Why not just rename validate_protection_domain here too.

Copy link
Member Author

Choose a reason for hiding this comment

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

I updated the comment to talk about avoiding the Java upcalls and to reflect the new names.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Seems a little verbose, but as it won't be relevant for that much longer I'm not overly concerned.

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8327651: Rename DictionaryEntry members related to protection domain

Reviewed-by: coleenp, dholmes

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 Mar 13, 2024
Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Ok, looks good.

…Rename-DictionaryEntry-members-for-Protection-Domain
@iklam
Copy link
Member Author

iklam commented Mar 17, 2024

Thanks @coleenp @dholmes-ora for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Mar 17, 2024

Going to push as commit d32ce65.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 0719419: 8328236: module_entry in CDS map file has stale value

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 17, 2024

@iklam Pushed as commit d32ce65.

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

None yet

3 participants