8343420: [lworld] compiler/gcbarriers/TestG1BarrierGeneration.java after merging JDK-8334060 in jdk-24+18

[dafedafe]

TestG1BarrierGeneration.testGetAndSet* tests fail after JDK-8351569. These tests check that VarHandle::getAndSet with G1 a particular GetAndSetP or GetAndSetN node is created with a barrier before and after.
JDK-8351569 refactored Unsafe::getAndSet (which is used by VarHandle::getAndSet) to take value-classes into account, which implies that checks must be introduced to see if the target and argument objects are value-classes. This is done with a new overloaded getAndSet method that is now called instead of the old one. This method is not intrinsified (only inlined) and doesn't result in a GetAndSet node. It instead relies on the compareAndSet method (which gets intrinsified) and results in a CompareAndSwap node.

As the goal of the test is mainly to check for G1 barrier creation, the sensible fix for now seems to be to modify the TestG1BarrierGeneration.testGetAndSet* tests to make them check for CompareAndSwap instead of GetAndSet nodes.

---

Progress

• Change must not contain extraneous whitespace

Issue

• JDK-8343420: [lworld] compiler/gcbarriers/TestG1BarrierGeneration.java after merging JDK-8334060 in jdk-24+18 (Bug - P4)

Reviewers

• Tobias Hartmann (@TobiHartmann - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1462

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

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

[openjdk]

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

8343420: [lworld] compiler/gcbarriers/TestG1BarrierGeneration.java after merging JDK-8334060 in jdk-24+18

Reviewed-by: thartmann

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

• 8580a4e: 8357461: [lworld] TestFlatInArraysFolding.java fails with UseNullableValueFlattening enabled by default
• 90c987a: [lworld] Some more problem listing for JDK-8348972
• 889e158: 8357454: [lworld] trivial: removed modules still named in LoadableDescriptorsAttrTest2 & ValueBasedFlagsTest
• ... and 255 more: https://git.openjdk.org/valhalla/compare/7739c4395e872e940bdf5de31867818f07460deb...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TobiHartmann) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk]

@dafedafe 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 JDK-8343420
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

[mlbridge]

Webrevs

• 00: Full (74bbcc12)

[TobiHartmann]

Thanks for investigating this Damon! The fix looks good to me.

[dafedafe]

Thanks for the review @TobiHartmann!

[dafedafe]

/integrate

[openjdk]

@dafedafe
Your change (at version 74bbcc1) is now ready to be sponsored by a Committer.

[TobiHartmann]

/sponsor

[openjdk]

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

• 8580a4e: 8357461: [lworld] TestFlatInArraysFolding.java fails with UseNullableValueFlattening enabled by default
• 90c987a: [lworld] Some more problem listing for JDK-8348972
• 889e158: 8357454: [lworld] trivial: removed modules still named in LoadableDescriptorsAttrTest2 & ValueBasedFlagsTest
• ... and 255 more: https://git.openjdk.org/valhalla/compare/7739c4395e872e940bdf5de31867818f07460deb...lworld

Your commit was automatically rebased without conflicts.

[openjdk]

@TobiHartmann @dafedafe Pushed as commit 5fb6b8e.

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