-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8354448: [REDO] Remove friends for ObjectMonitor #24626
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 |
@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 29 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 |
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. I didn't find it trivial though.
Thanks for the reviews. I'll not treat it as trivial and wait. Once bitten (not burned) twice shy. |
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.
It probably would have helped if set_recursions
had a comment stating what it is used for (which seems to be setting recursions when an anonymously owned monitor is given its true owner details).
Updated fix is fine. Thanks
@@ -150,6 +150,11 @@ inline void ObjectMonitor::set_recursions(size_t recursions) { | |||
_recursions = checked_cast<intx>(recursions); | |||
} | |||
|
|||
inline void ObjectMonitor::increment_recursions(JavaThread* current) { | |||
assert(has_owner(current), "must be the owner"); |
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.
May be overkill to have this assert ...
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.
Yeah this method will be removed with legacy locking.
Thanks for reviewing. |
Going to push as commit 273a9a6.
Your commit was automatically rebased without conflicts. |
This is a redo of the trivial change that failed. The second commit is the method I should have added.
Tested with tier1-4, where tier3 has the code to exercise LockingMode=1.
Thanks,
Coleen
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24626/head:pull/24626
$ git checkout pull/24626
Update a local copy of the PR:
$ git checkout pull/24626
$ git pull https://git.openjdk.org/jdk.git pull/24626/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24626
View PR using the GUI difftool:
$ git pr show -t 24626
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24626.diff
Using Webrev
Link to Webrev Comment