Skip to content

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

Closed
wants to merge 2 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Apr 14, 2025

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

  • 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-8354448: [REDO] Remove friends for ObjectMonitor (Bug - P4)

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 14, 2025

👋 Welcome back coleenp! 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 Apr 14, 2025

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

8354448: [REDO] Remove friends for ObjectMonitor

Reviewed-by: kbarrett, shade, 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 29 new commits pushed to the master branch:

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 14, 2025
@openjdk
Copy link

openjdk bot commented Apr 14, 2025

@coleenp 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.

@mlbridge
Copy link

mlbridge bot commented Apr 14, 2025

Webrevs

Copy link

@kimbarrett kimbarrett left a 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 14, 2025
@coleenp
Copy link
Contributor Author

coleenp commented Apr 14, 2025

Thanks for the reviews. I'll not treat it as trivial and wait. Once bitten (not burned) twice shy.

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.

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");
Copy link
Member

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

Copy link
Contributor Author

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.

@coleenp
Copy link
Contributor Author

coleenp commented Apr 15, 2025

Thanks for reviewing.
/integrate

@openjdk
Copy link

openjdk bot commented Apr 15, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 15, 2025

@coleenp Pushed as commit 273a9a6.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@coleenp coleenp deleted the redo-friends branch April 15, 2025 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants