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

8317299: safepoint scalarization doesn't keep track of the depth of the JVM state #716

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 13, 2024

Backport of JDK-8317299. Needs manual integration in callnode.cpp, callnode.hpp, macro.cpp and vector.cpp because of unrelated context differences. All hunks are integrated.
In addition, I had to insert @enablePreview into the test update because MemorySegment is a preview API and is disabled by default in JDK21. Please review!


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8317299 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8317299: safepoint scalarization doesn't keep track of the depth of the JVM state (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 716

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 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 13, 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:

8317299: safepoint scalarization doesn't keep track of the depth of the JVM state

Reviewed-by: phh

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 2 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

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 changed the title Backport 6d911f68a3244c40a62ab2570dfec68b8d0ed5d8 8317299: safepoint scalarization doesn't keep track of the depth of the JVM state Jun 13, 2024
@openjdk
Copy link

openjdk bot commented Jun 13, 2024

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 Jun 13, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 13, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 13, 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.

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 21.0.5-oracle. The backport has been reviewed and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 14, 2024

@TheRealMDoerr
8317299: 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 d2f857a.
Since your change was applied there have been 4 commits pushed to the master branch:

  • 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

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

openjdk bot commented Jun 14, 2024

@TheRealMDoerr Pushed as commit d2f857a.

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

@TheRealMDoerr TheRealMDoerr deleted the 8317299_C2_safepoint_scalarization branch June 14, 2024 16:25
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