8374151: Cleanup minor markWord function disorder

[stefank]

I propose a minor restructuring to have the hash, monitor, and displaced_marker_helper functions grouped instead of intermixed.

---

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-8374151: Cleanup minor markWord function disorder (Enhancement - P4)

Reviewers

• David Holmes (@dholmes-ora - Reviewer) Review applies to 21a499b1
• Roberto Castañeda Lozano (@robcasloz - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28928

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back stefank! A progress list of the required criteria for merging this PR into pr/28927 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

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

8374151: Cleanup minor markWord function disorder

Reviewed-by: rcastanedalo, 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 1 new commit pushed to the master branch:

• 551e656: 8374113: Taughtological if check in Reflection::array_set

Please see this link for an up-to-date comparison between the source branch of this pull request and 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]

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

[mlbridge]

Webrevs

• 02: Full - Incremental (70c9d633)
• 01: Full - Incremental (21a499b1)
• 00: Full (21a499b1)

[dholmes-ora]

Seems trivially fine.

I'm assuming this will allow some incoming valhalla changes to slide in more easily.

[stefank]

I'm assuming this will allow some incoming valhalla changes to slide in more easily.

Maybe only marginally. The removal in #28927 clarifies an assumption in the Valhalla code that I was reviewing. And while discussing other cleanups to the markWord code in Valhalla, I noticed that markWord file could probably benefit from a clearer grouping of the existing function. So, this change isn't strictly necessary, but I do think it aids the readability of the file.

[stefank]

Thanks for reviewing!

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8374151_markword_discorder
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[stefank]

/integrate

[openjdk]

@stefank This pull request has not yet been marked as ready for integration.

[robcasloz]

Looks good, and trivial.

[stefank]

Thanks for re-reviewing!
/integrate

[openjdk]

Going to push as commit 2715f5e.
Since your change was applied there has been 1 commit pushed to the master branch:

• 551e656: 8374113: Taughtological if check in Reflection::array_set

Your commit was automatically rebased without conflicts.

[openjdk]

@stefank Pushed as commit 2715f5e.

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