Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8341242: Shenandoah: LRB node is not matched as GC barrier after JDK-8340183 #21266

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 30, 2024

JDK-8340183 introduced a regression: ShenandoahBarrierSetC2::is_gc_barrier_node is now answering false for the actual ShenandoahLoadReferenceBarrierNode. The fix reinstates the check for LRB node.

Additional testing:

  • Linux x86_64 server fastdebug, hotspot_gc_shenandoah
  • Linux x86_64 server fastdebug, jdk/jfr/api/consumer/ (100x) -- used to fail intermittently, now it does not

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-8341242: Shenandoah: LRB node is not matched as GC barrier after JDK-8340183 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21266

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2024

👋 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 Sep 30, 2024

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

8341242: Shenandoah: LRB node is not matched as GC barrier after JDK-8340183

Reviewed-by: rkennke, phh

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 3 new commits pushed to the master branch:

  • a6b3188: 8337632: AES-GCM Algorithm optimization for x86_64
  • 5586f83: 8341064: Define anchor point and index term for "wrapper classes"
  • 4168faf: 8341100: Add index entries for terms used in java.lang.Class

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 openjdk bot added the rfr Pull request is ready for review label Sep 30, 2024
@openjdk
Copy link

openjdk bot commented Sep 30, 2024

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

  • hotspot-gc
  • shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot-gc hotspot-gc-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Sep 30, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2024

Webrevs

@shipilev shipilev changed the title 8340183: Shenandoah: LRB node is not matched as GC barrier after JDK-8340183 8341242: Shenandoah: LRB node is not matched as GC barrier after JDK-8340183 Sep 30, 2024
Copy link
Contributor

@rkennke rkennke 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!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 30, 2024
@shipilev
Copy link
Member Author

Thanks! Trivial, right? Restores the code to previous shape.

@shipilev
Copy link
Member Author

shipilev commented Oct 1, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Oct 1, 2024

Going to push as commit 684d246.
Since your change was applied there have been 14 commits pushed to the master branch:

  • 7cc7c08: 8337493: [JVMCI] Number of libgraal threads might be too low
  • f7c7958: 8340420: ZGC: Should call vm_shutdown_during_initialization if initialization fails
  • 2dc3b1a: 8341201: Broken link in AbstractAnnotationValueVisitor7 due to extra quotation mark
  • ad5ffcc: 8341168: Cleanup dead code after JDK-8322630
  • 1b46fea: 8341024: [test] build/AbsPathsInImage.java fails with OOM when using ubsan-enabled binaries
  • 9bd4785: 8340437: Open source few more AWT Frame related tests
  • 988f13a: 8340354: Open source AWT desktop properties and print related tests
  • b11066b: 8340719: Open source AWT List tests
  • a32c3b4: 8340407: Open source a few more Component related tests
  • 31858fc: 8340491: Thread stack-base assertion should report which thread has the un-set stack
  • ... and 4 more: https://git.openjdk.org/jdk/compare/f1bf469b4ee07b48b629a126111e307d3cab7fd7...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 1, 2024
@openjdk openjdk bot closed this Oct 1, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 1, 2024
@openjdk
Copy link

openjdk bot commented Oct 1, 2024

@shipilev Pushed as commit 684d246.

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

Successfully merging this pull request may close these issues.

3 participants