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

8318183: C2: VM may crash after hitting node limit #2044

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Dec 11, 2023

Semi-clean backport to solve a potential VM crash due to C2 failing.

The uncleanliness comes from two places:

  1. In Compile::Optimize(), we do not have the new hunk from JDK-8286104: openjdk/jdk@31e50f2#diff-f076857d7da81f56709da3de1511b1105727032186cde4d02c678667761f46eaR2247-R2248 -- so no return is needed.
  2. In PhaseIdealLoop::verify, we do not have the rewrites from JDK-8173709: openjdk/jdk@24c6af0#diff-d49652d43244d52415873c37bf6990269b0d6e2f2111f4f971660470b6bca738R4653-R4657 -- so I had to resolve the conflict by hand.

Additional testing:

  • Linux x86_64 server fastdebug tier{1,2,3}
  • Linux AArch64 server fastdebug tier{1,2,3}

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-8318183 needs maintainer approval

Issue

  • JDK-8318183: C2: VM may crash after hitting node limit (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2044

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 11, 2023

👋 Welcome back shade! 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 31ef400f31b1fd9a861870cce69f6d3eec72aa46 8318183: C2: VM may crash after hitting node limit Dec 11, 2023
@openjdk
Copy link

openjdk bot commented Dec 11, 2023

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

@openjdk openjdk bot added the backport label Dec 11, 2023
@shipilev shipilev marked this pull request as ready for review December 12, 2023 19:00
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 12, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 12, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 12, 2023

⚠️ @shipilev 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.

@shipilev
Copy link
Member Author

/approval request Semi-clean backport to solve a potential VM crash due to C2 failing. Applies with minor conflicts. 17u PR acked by Paul Hohensee. Testing passes.

@openjdk
Copy link

openjdk bot commented Dec 19, 2023

@shipilev
8318183: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Dec 19, 2023
@GoeLin
Copy link
Member

GoeLin commented Dec 20, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Dec 20, 2023

@GoeLin
8318183: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Dec 20, 2023

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

8318183: C2: VM may crash after hitting node limit

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 1 new commit pushed to the master branch:

  • 43d15d1: 8307926: Support byte-sized atomic bitset operations

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 Dec 20, 2023
@shipilev
Copy link
Member Author

shipilev commented Jan 3, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 3, 2024

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

  • 53211e0: 8318961: increase javacserver connection timeout values and max retry attempts
  • 5d86e19: 8320937: support latest VS2022 MSC_VER in abstract_vm_version.cpp
  • 43d15d1: 8307926: Support byte-sized atomic bitset operations

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 3, 2024

@shipilev Pushed as commit 2a0d0ac.

💡 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
3 participants