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

8309956: Shenandoah: Strengthen the mark word check in string dedup #1443

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 15, 2023

Clean backport to improve Shenandoah reliability.

Additional testing:

  • macos-aarch64-server-fastdebug, hotspot_gc_shenandoah

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8309956: Shenandoah: Strengthen the mark word check in string dedup (Enhancement - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1443/head:pull/1443
$ git checkout pull/1443

Update a local copy of the PR:
$ git checkout pull/1443
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1443/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1443

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1443.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2023

👋 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 openjdk bot changed the title Backport 57b8251241e2044d5039ce162bf4637a9b2e5466 8309956: Shenandoah: Strengthen the mark word check in string dedup Jun 15, 2023
@openjdk
Copy link

openjdk bot commented Jun 15, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jun 15, 2023

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

8309956: Shenandoah: Strengthen the mark word check in string dedup

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

  • f9a6075: 8302150: Speed up compiler/codegen/Test7100757.java
  • 954bbaa: 8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
  • 30d0484: 8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
  • 31a7fd3: 8298921: Create a regression test for JDK-8139581
  • faafe22: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • 01ac9cb: 8309138: Fix container tests for jdks with symlinked conf dir

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 15, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 15, 2023

Webrevs

@shipilev
Copy link
Member Author

Testing is clean. Push approval is here.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 20, 2023

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

  • 3773e0b: 8309228: Clarify EXPERIMENTAL flags comment in hotspot/share/runtime/globals.hpp
  • aa3b4e4: 8305236: Some LoadLoad barriers in the interpreter are unnecessary after JDK-8220051
  • bda6723: 8282665: [REDO] ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
  • 393aeaf: 8272586: emit abstract machine code in hs-err logs
  • d85a847: 8289688: jfr command hangs when it processes invalid file
  • 9780137: 8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
  • 0368ae9: 8306738: Select num workers for safepoint ParallelCleanupTask
  • 249ddf4: 8293252: Shenandoah: ThreadMXBean synchronizer tests crash with aggressive heuristics
  • 5a4e374: 8309959: JFR: Display N/A for missing data amount
  • 6c81bf5: 8295811: serviceability/sa/TestObjectAlignment.java fails on x86_32
  • ... and 24 more: https://git.openjdk.org/jdk17u-dev/compare/6991372a06f7e623112f1437eeaed7ad7eb6eb99...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 20, 2023

@shipilev Pushed as commit fb1741c.

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

@shipilev shipilev deleted the JDK-8309956-shenandoah-strdedup branch July 20, 2023 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant