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 #2288

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Nov 21, 2023

Backport of JDK-8316746. Version from 17u-dev is almost identical. Diffs:

  • Unused label from old code has been removed by openjdk/jdk17u-dev@12bac3a.
  • _abi has been renamed to _abi0 in later JDK versions.

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
  • JDK-8316746 needs maintainer approval

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2288

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 21, 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 21, 2023
@openjdk
Copy link

openjdk bot commented Nov 21, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 21, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 21, 2023

Webrevs

Copy link
Member

@reinrich reinrich 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.
Cheers, Richard.

@openjdk
Copy link

openjdk bot commented Nov 22, 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.

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!

@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). This gets currently only detected by the new lightweight locking, but the bug exists independently. The fix has been tested in jdk head, jdk 21u and the backport in jdk 17u-dev and jdk 11u-dev in our nightly tests. The version for 11 is almost identical to the version for 17 and has been reviewed.

@openjdk
Copy link

openjdk bot commented Nov 23, 2023

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

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

openjdk bot commented Nov 27, 2023

@TheRealMDoerr This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

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

Reviewed-by: rrich

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

  • 2420592: 8312126: NullPointerException in CertStore.getCRLs after 8297955
  • a72d0b2: 8240754: Instrument FlowTest.java to provide more debug traces.
  • fca62cf: 8289077: Add manual tests to open
  • 250d7a8: 8214694: cleanup rawtypes warnings in open jndi tests
  • fac5955: 8238740: java/net/httpclient/whitebox/FlowTestDriver.java should not specify a TLS protocol

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

/integrate

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

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

  • 2420592: 8312126: NullPointerException in CertStore.getCRLs after 8297955
  • a72d0b2: 8240754: Instrument FlowTest.java to provide more debug traces.
  • fca62cf: 8289077: Add manual tests to open
  • 250d7a8: 8214694: cleanup rawtypes warnings in open jndi tests
  • fac5955: 8238740: java/net/httpclient/whitebox/FlowTestDriver.java should not specify a TLS protocol

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 27, 2023
@openjdk openjdk bot closed this Nov 27, 2023
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 27, 2023
@TheRealMDoerr TheRealMDoerr deleted the 8316746_lock_stack_PPC64 branch November 27, 2023 09:57
@openjdk openjdk bot removed the rfr Pull request is ready for review label Nov 27, 2023
@openjdk
Copy link

openjdk bot commented Nov 27, 2023

@TheRealMDoerr Pushed as commit 6321d3e.

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

Successfully merging this pull request may close these issues.

2 participants