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

8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity #698

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 12, 2024

Backport of JDK-8322996. Applies cleanly except + if (failing()) { return; } in parse2.cpp which required manual integration due to unrelated context changes.


Progress

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

Issue

  • JDK-8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 698

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 12, 2024

👋 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
Copy link

openjdk bot commented Jun 12, 2024

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

8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity

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

  • df03054: 8319793: C2 compilation fails with "Bad graph detected in build_loop_late" after JDK-8279888
  • 9069982: 8332935: Crash: assert(*lastPtr != 0) failed: Mismatched JNINativeInterface tables, check for new entries
  • ccfae88: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
  • a1a56cf: 8330814: Cleanups for KeepAliveCache tests
  • 1831a95: 8323122: AArch64: Increase itable stub size estimate
  • 622026a: 8316756: C2 EA fails with "missing memory path" when encountering unsafe_arraycopy stub call
  • 807a4b6: 8324174: assert(m->is_entered(current)) failed: invariant
  • 03facb9: 8332905: C2 SuperWord: bad AD file, with RotateRightV and first operand not a pack
  • 4cd947b: 8327423: C2 remove_main_post_loops: check if main-loop belongs to pre-loop, not just assert
  • ea2aa9e: 8324969: C2: prevent elimination of unbalanced coarsened locking regions
  • ... and 10 more: https://git.openjdk.org/jdk21u-dev/compare/160ea2257413c3f336dd087f28b47ea9817799bc...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 changed the title Backport 69586e7bdffe1a840c3a86e6ec83568de24c6fe5 8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity Jun 12, 2024
@openjdk
Copy link

openjdk bot commented Jun 12, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 12, 2024

⚠️ @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 Jun 12, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 12, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 21.0.5-oracle. Applies cleanly and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 14, 2024

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

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 14, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 14, 2024

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

  • d2f857a: 8317299: safepoint scalarization doesn't keep track of the depth of the JVM state
  • 9a392ea: 8323972: C2 compilation fails with assert(!x->as_Loop()->is_loop_nest_inner_loop()) failed: loop was transformed
  • dba6716: 8321278: C2: Partial peeling fails with assert "last_peel <- first_not_peeled"
  • df03054: 8319793: C2 compilation fails with "Bad graph detected in build_loop_late" after JDK-8279888
  • 9069982: 8332935: Crash: assert(*lastPtr != 0) failed: Mismatched JNINativeInterface tables, check for new entries
  • ccfae88: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
  • a1a56cf: 8330814: Cleanups for KeepAliveCache tests
  • 1831a95: 8323122: AArch64: Increase itable stub size estimate
  • 622026a: 8316756: C2 EA fails with "missing memory path" when encountering unsafe_arraycopy stub call
  • 807a4b6: 8324174: assert(m->is_entered(current)) failed: invariant
  • ... and 13 more: https://git.openjdk.org/jdk21u-dev/compare/160ea2257413c3f336dd087f28b47ea9817799bc...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 14, 2024
@openjdk openjdk bot closed this Jun 14, 2024
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 14, 2024
@TheRealMDoerr TheRealMDoerr deleted the 8322996_C2_BoxLockNode branch June 14, 2024 16:22
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jun 14, 2024
@openjdk
Copy link

openjdk bot commented Jun 14, 2024

@TheRealMDoerr Pushed as commit 8ca5280.

💡 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