Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Nov 20, 2025

As you can see in the report, current matchers rely heavily on mainline C2 implementation to match specific stores. This fails when we try to backport MergeStores fixes to 25u. It would be better to relax the matchers a bit to cater for 25u backports, and also making test more robust for future MergeStores changes, if any.

Additional testing:

  • Linux x86_64 server fastdebug, mainline, affected test, 100x
  • Linux AArch64 server fastdebug, mainline, affected test, 100x
  • Linux x86_64 server fastdebug, jdk25u, affected test, 100x

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-8372266: Relax store matchers in compiler/escapeAnalysis/TestRematerializeObjects.java test (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28437

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 20, 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 Nov 20, 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:

8372266: Relax store matchers in compiler/escapeAnalysis/TestRematerializeObjects.java test

Reviewed-by: kvn

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 43 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 Nov 20, 2025

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

  • hotspot-compiler

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 rfr Pull request is ready for review label Nov 20, 2025
@mlbridge
Copy link

mlbridge bot commented Nov 20, 2025

Webrevs

@shipilev
Copy link
Member Author

/touch

Hey bots, figure out the issue exists.

@openjdk
Copy link

openjdk bot commented Nov 21, 2025

@shipilev The pull request is being re-evaluated and the inactivity timeout has been reset.

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.

Looks good to me. I submitted testing.

@vnkozlov
Copy link
Contributor

@eme64 please look on this too.

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.

My testing passed.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-compiler [email protected] ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants