-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8302108: Clean up placeholder supername code #12495
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
|
👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into |
dholmes-ora
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.
Took me a while to get my head around the SymbolHandle mechanics for ref counting, but once I did this looks good. :) Thanks.
|
@coleenp 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 28 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 |
|
Thanks David. I had printf code to verify what SymbolHandle refcounting did to understand it but it's better that it just works rather than ad-hoc ref counting. |
iklam
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.
LGTM. Just a small nit.
| void add_seen_thread(JavaThread* thread, PlaceholderTable::classloadAction action); | ||
| bool remove_seen_thread(JavaThread* thread, PlaceholderTable::classloadAction action); | ||
|
|
||
| SeenThread* superThreadQ() const { return _superThreadQ; } |
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.
If you just want to change these function to private, instead of moving them, I would suggest adding private: and public: keywords around them. That way we can limit the delta.
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.
I really wanted them moved to the section of the class where the other private methods are. This class isn't so overgrown that we need to keep switching from private to public, and I want the public methods to be together.
Java is nice in that you can have 'private' and 'public' keywords on each function, but I'd still like to keep the public ones together.
|
Thanks for reviewing Ioi! |
|
Going to push as commit abbeb7e.
Your commit was automatically rebased without conflicts. |
Please review change to make PlaceholderEntry::_supername a SymbolHandle to correctly refcount the symbol rather than have ad-hoc code. It also moves the private functions to private and asserts invariant that find_and_remove must always find a matching entry. Finally, this also more eagerly removes the supername symbol from the placeholder entry, so I have to fix the test in #12491 before pushing this.
Tested with tier1-4.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12495/head:pull/12495$ git checkout pull/12495Update a local copy of the PR:
$ git checkout pull/12495$ git pull https://git.openjdk.org/jdk pull/12495/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 12495View PR using the GUI difftool:
$ git pr show -t 12495Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12495.diff