Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Mar 31, 2025

Various MacroAssembler methods have this code to support passing the thread register, and getting it if noreg is passed:

  // determine java_thread register
  if (!java_thread->is_valid()) {
#ifdef _LP64
    java_thread = r15_thread;
#else
    java_thread = rdi;
    get_thread(java_thread);
#endif // LP64
  }

This never happens after 32-bit x86 removal. x86_64 always uses r15_thread. We can clean those up.

These are also the only major users of MacroAssembler::get_thread that we want to remove/rename to avoid falling into traps like JDK-8353176.

Additional testing:

  • Linux x86_64 server fastdebug, all

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-8353174: Clean up thread register handling after 32-bit x86 removal (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24323

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2025

👋 Welcome back shade! 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 Mar 31, 2025

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

8353174: Clean up thread register handling after 32-bit x86 removal

Reviewed-by: cslucas, kvn, vlivanov

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 25 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 Mar 31, 2025

@shipilev The following label will be automatically applied to this pull request:

  • hotspot

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 hotspot-dev@openjdk.org label Mar 31, 2025
@shipilev shipilev force-pushed the JDK-8353174-x86-thread-reg branch 2 times, most recently from d43572e to 054c860 Compare April 1, 2025 08:16
@shipilev shipilev force-pushed the JDK-8353174-x86-thread-reg branch from 054c860 to 218b0f2 Compare April 7, 2025 10:23
@shipilev shipilev force-pushed the JDK-8353174-x86-thread-reg branch from 218b0f2 to 02e29a7 Compare April 8, 2025 07:07
@shipilev shipilev marked this pull request as ready for review April 8, 2025 10:53
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 8, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 8, 2025

Webrevs

Copy link
Contributor

@JohnTortugo JohnTortugo left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

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

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

@shipilev
Copy link
Member Author

shipilev commented Apr 9, 2025

Thanks all! I have re-merged with master locally, and there are no evident problems. So I am integrating.

/integrate

@openjdk
Copy link

openjdk bot commented Apr 9, 2025

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

openjdk bot commented Apr 9, 2025

@shipilev Pushed as commit 6df34c3.

💡 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 hotspot-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants