Skip to content

8357396: Refactor nmethod::make_not_entrant to use Enum instead of "const char*" #25338

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 5 commits into from

Conversation

JohnTortugo
Copy link
Contributor

@JohnTortugo JohnTortugo commented May 20, 2025

Please review this refactor to transform the reasons for making an nmethod not entrant from const char* into enum values.

Tested on Linux x64 with JTREG tier1-3 in fastdebug and release mode.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8357396: Refactor nmethod::make_not_entrant to use Enum instead of "const char*" (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25338

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 20, 2025

👋 Welcome back cslucas! 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 May 20, 2025

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

8357396: Refactor nmethod::make_not_entrant to use Enum instead of "const char*"

Reviewed-by: mhaessig, shade

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 914 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
Copy link

openjdk bot commented May 20, 2025

@JohnTortugo this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout reasons
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label May 20, 2025
@openjdk
Copy link

openjdk bot commented May 20, 2025

@JohnTortugo The following labels will be automatically applied to this pull request:

  • graal
  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added graal [email protected] hotspot [email protected] and removed merge-conflict Pull request has merge conflict with target branch labels May 20, 2025
@JohnTortugo JohnTortugo changed the title Reasons 8357396: Refactor nmethod::make_not_entrant to use Enum instead of "const char*" May 22, 2025
@JohnTortugo JohnTortugo marked this pull request as ready for review May 22, 2025 22:34
@openjdk openjdk bot added the rfr Pull request is ready for review label May 22, 2025
@mlbridge
Copy link

mlbridge bot commented May 22, 2025

Webrevs

Copy link
Contributor

@mhaessig mhaessig left a comment

Choose a reason for hiding this comment

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

Thank you for working on this. I agree that an enum is the better option here.
However, a scoped enum might be more appropriate here. For one, because that is the guidance in the style guide. Secondly, I would argue that this enum should have some as_string-like function so the reason is still printed in plain text insteatd of an int. That spares me going into the source and counting down the enum, when I'm debugging a deopt 😅 . Once the codes does no rely on implicint conversion to print an int, we do not care about the underlying type.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

I added this argument to make_not_entrant recently in JDK-8351640 -- mostly to print it in PrintCompilation logs. Putting enum might be fine, but it has to maintain the same level of human readability. Do not just print made not entrant: 42.

@JohnTortugo
Copy link
Contributor Author

Thank you for the comments. I'll make the refactoring.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks conceptually fine. Cosmetics:

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Almost there, more cosmetics.

Copy link
Member

@shipilev shipilev 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 to me. Compiler folks might want to ack as well.

/reviewers 2

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 3, 2025
@openjdk
Copy link

openjdk bot commented Jun 3, 2025

@shipilev
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 3, 2025
Copy link
Contributor

@mhaessig mhaessig left a comment

Choose a reason for hiding this comment

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

Thank you for addressing the comments. It looks good now.

I ran some additional testing that passed.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 5, 2025
@JohnTortugo
Copy link
Contributor Author

Thank you @shipilev , @mhaessig for reviewing/testing.

@JohnTortugo
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 5, 2025

Going to push as commit 62fde68.
Since your change was applied there have been 914 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 Jun 5, 2025
@openjdk openjdk bot closed this Jun 5, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 5, 2025
@openjdk
Copy link

openjdk bot commented Jun 5, 2025

@JohnTortugo Pushed as commit 62fde68.

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

Successfully merging this pull request may close these issues.

4 participants