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

8316746: Top of lock-stack does not match the unlocked object #361

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Nov 14, 2023

Backport of PPC64 fix JDK-8316746. The issue was observed with the new lightweight locking, but the bug is not limited to it. C2 OSR compiled methods may be wrong when the monitor slots were reused in opposite order (see included test).


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8316746 needs maintainer approval

Issue

  • JDK-8316746: Top of lock-stack does not match the unlocked object (Bug - P2 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 361

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/361.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 14, 2023

👋 Welcome back mdoerr! 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 7d8adfa855e51a90c2f125fc20a06f9a488e6248 8316746: Top of lock-stack does not match the unlocked object Nov 14, 2023
@openjdk
Copy link

openjdk bot commented Nov 14, 2023

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

@openjdk
Copy link

openjdk bot commented Nov 14, 2023

⚠️ @TheRealMDoerr This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 14, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 14, 2023

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request C2 OSR compiled methods are wrong on PPC64 in very rare cases without this fix (wrong unlock order). The fix applies cleanly and has been tested in jdk head and this backport in jdk 21u in our nightly tests. It only changes PPC64 code, removes wrong comments from some other platforms and adds a test which passes on all platforms.

@openjdk
Copy link

openjdk bot commented Nov 15, 2023

@TheRealMDoerr
8316746: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Nov 15, 2023
@openjdk
Copy link

openjdk bot commented Nov 20, 2023

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

8316746: Top of lock-stack does not match the unlocked object

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

  • 6453e64: 8294158: HTML formatting for PassFailJFrame instructions
  • 2545f55: 8317039: Enable specifying the JDK used to run jtreg
  • 321ba68: 8313643: Update HarfBuzz to 8.2.2
  • ffa87b5: 8318240: [AIX] Cleaners.java test failure
  • 44b5b81: 8313782: Add user-facing warning if THPs are enabled but cannot be used
  • 99d260c: 8313781: Add regression tests for large page logging and user-facing error messages
  • 3c712ed: 8315195: RISC-V: Update hwprobe query for new extensions
  • cb352c2: 8318759: Add four DigiCert root certificates
  • d603f8a: 8312191: ColorConvertOp.filter for the default destination is too slow
  • 245885b: 8319436: Proxy.newProxyInstance throws NPE if loader is null and interface not visible from class loader
  • ... and 12 more: https://git.openjdk.org/jdk21u/compare/bac4829e05d74e1ea5655d508f271e7a2cf10eb9...master

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 and removed approval labels Nov 20, 2023
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 20, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 20, 2023

@TheRealMDoerr Pushed as commit 7588fce.

💡 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
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant