8318895: Deoptimization results in incorrect lightweight locking stack

[rkennke]

See JBS issue for details.

I basically:

• took the test-modification and turned it into its own test-case
• added test runners for lightweight- and legacy-locking, so that we keep testing both, no matter what is the default
• added Axels fix (mentioned in the JBS issue) with the modification to only inflate when exec_mode == Unpack_none, as explained by Richard.

Testing:

• EATests.java
• tier1
• tier2

---

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-8318895: Deoptimization results in incorrect lightweight locking stack (Bug - P3)

Reviewers

• Dean Long (@dean-long - Reviewer) ⚠️ Review applies to d9370df6
• Richard Reingruber (@reinrich - Reviewer) ⚠️ Review applies to 966d0a3e

Contributors

• Axel Boldt-Christmas <aboldtch@openjdk.org>
• Richard Reingruber <rrich@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16568

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back rkennke! 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]

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

• hotspot
• serviceability

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.

[mlbridge]

Webrevs

• 02: Full - Incremental (b27def47)
• 01: Full - Incremental (966d0a3e)
• 00: Full (d9370df6)

[rkennke]

/contributor add @xmas92

[openjdk]

@rkennke
Contributor Axel Boldt-Christmas <aboldtch@openjdk.org> successfully added.

[openjdk]

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

8318895: Deoptimization results in incorrect lightweight locking stack

Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org>
Co-authored-by: Richard Reingruber <rrich@openjdk.org>
Reviewed-by: dlong, 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 26 new commits pushed to the master branch:

• c9657ca: 8319882: SequenceLayout::toString throws ArithmeticException
• 6b21ff6: 8319828: runtime/NMT/VirtualAllocCommitMerge.java may fail if mixing interpreted and compiled native invocations
• a64fc48: 8319174: Enhance robustness of some j.m.BigInteger constructors
• 9cce9fe: 8319256: Print more diagnostic information when an unexpected user is found in a Phi
• a95062b: 8319670: Improve comments describing system properties for TLS server and client for max chain length
• 38745ec: 8319649: inline_boxing_calls unused gvn variable
• 636a351: 8319429: Resetting MXCSR flags degrades ecore
• d7b0ba9: 8319554: Select LogOutput* directly for stdout and stderr
• 68110b7: 8319574: Exec/process tests should be marked as flagless
• 7b971c1: 8319705: RISC-V: signumF/D intrinsics fails compiler/intrinsics/math/TestSignumIntrinsic.java
• ... and 16 more: https://git.openjdk.org/jdk/compare/7d25f1c6cb770e21cfad8096c1637a24e65fab8c...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.

[reinrich]

Hi Roman,

thanks for opening the pr.

I've implemented another test case that demonstrates why relocking should be done before an object reference with eliminated locking is passed to a JVMTI agent. Would it be ok to include it in your pr?
(This is a version where relocking is delayed until the compiled frame is deoptimized. The new test fails with -XX:+UseNewCode).

I will put the change through our CI testing.

Cheers, Richard.

[reinrich]

Fix and new test case look good to me.
Local testing was clean.
Thanks, Richard.

[rkennke]

/contributor add @reinrich

[openjdk]

@rkennke
Contributor Richard Reingruber <rrich@openjdk.org> successfully added.

[rkennke]

Thanks, all!

/integrate

[openjdk]

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

• c9657ca: 8319882: SequenceLayout::toString throws ArithmeticException
• 6b21ff6: 8319828: runtime/NMT/VirtualAllocCommitMerge.java may fail if mixing interpreted and compiled native invocations
• a64fc48: 8319174: Enhance robustness of some j.m.BigInteger constructors
• 9cce9fe: 8319256: Print more diagnostic information when an unexpected user is found in a Phi
• a95062b: 8319670: Improve comments describing system properties for TLS server and client for max chain length
• 38745ec: 8319649: inline_boxing_calls unused gvn variable
• 636a351: 8319429: Resetting MXCSR flags degrades ecore
• d7b0ba9: 8319554: Select LogOutput* directly for stdout and stderr
• 68110b7: 8319574: Exec/process tests should be marked as flagless
• 7b971c1: 8319705: RISC-V: signumF/D intrinsics fails compiler/intrinsics/math/TestSignumIntrinsic.java
• ... and 16 more: https://git.openjdk.org/jdk/compare/7d25f1c6cb770e21cfad8096c1637a24e65fab8c...master

Your commit was automatically rebased without conflicts.

[openjdk]

@rkennke Pushed as commit ea1ffa3.

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

[dholmes-ora]

This PR calls code that expects to be passed a reference to the current thread, but is instead passed the deoptee_thread! See https://bugs.openjdk.org/browse/JDK-8324881

There may be an issue here but it is pre-existing (at least to some extent).