8380870: [lworld] More unification of 32-bit code in markWord.hpp

[stefank]

Two of the Valhalla bits are protected by 64/32 bit checks, but the other two are not. This also makes the top comment incorrect for 32-bit versions. I propose some small tweaks to make it less confusing for reviewers / readers of the code.

---

Progress

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

Issue

• JDK-8380870: [lworld] More unification of 32-bit code in markWord.hpp (Enhancement - P4)

Reviewers

• Frederic Parain (@fparain - Committer) ⚠️ Review applies to 7fc24398
• Paul Hübner (@Arraying - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2260

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/2260.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back stefank! A progress list of the required criteria for merging this PR into pr/2258 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:

8380870: [lworld] More unification of 32-bit code in markWord.hpp

Reviewed-by: fparain, phubner

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 121 new commits pushed to the lworld branch:

• d3b6dca: 8380282: [lworld] Problem-list several SA/jhsdb tests when running with --enable-preview
• 35b7ee2: 8381211: [lworld] ProblemList compiler/c2/irTests/TestFloat16ScalarOperations.java on linux-aarch64
• 4bdc262: Merge
• ... and 118 more: https://git.openjdk.org/valhalla/compare/ee48773888ced8e22149ea519028611001563030...lworld

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

[mlbridge]

Webrevs

• 04: Full - Incremental (54951ad3)
• 03: Full - Incremental (09283185)
• 02: Full (c03631c0)
• 01: Full - Incremental (5bc8cb2c)
• 00: Full (7fc24398)

[fparain]

Looks good to me.
This PR is marked as going to be pushed to #2258
Is this PR going to merge into PR 2258 or are PR 2258 and PR 2260 be pushed to the lworld branch as two different PRs ?

[fparain]

I've approved this PR before noticing that the new assert in is_neutral() was causing failures in GTests, this will have to be fixed before integration.

[stefank]

This PR is marked as going to be pushed to #2258

This is how we work with dependent pull requests in GitHub. My changes were made on top of the changes in 2258, as soon as 2258 has been integrated this PR will be targeted to lworld.

[stefank]

I see now that I've fixed the test in another follow-up. I'll pull that fix into this PR.

[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 8380870_lworld_32_bit_mark_word_tweaks
git fetch https://git.openjdk.org/valhalla.git lworld
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge lworld"
git push

[openjdk]

@stefank this pull request can not be integrated into lworld 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 8380870_lworld_32_bit_mark_word_tweaks
git fetch https://git.openjdk.org/valhalla.git lworld
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge lworld"
git push

[Arraying]

LGTM, thanks.

[stefank]

Thanks for reviewing!
/integrate

[openjdk]

Going to push as commit 9681478.
Since your change was applied there have been 121 commits pushed to the lworld branch:

• d3b6dca: 8380282: [lworld] Problem-list several SA/jhsdb tests when running with --enable-preview
• 35b7ee2: 8381211: [lworld] ProblemList compiler/c2/irTests/TestFloat16ScalarOperations.java on linux-aarch64
• 4bdc262: Merge
• ... and 118 more: https://git.openjdk.org/valhalla/compare/ee48773888ced8e22149ea519028611001563030...lworld

Your commit was automatically rebased without conflicts.

[openjdk]

@stefank Pushed as commit 9681478.

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