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

8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes? #218

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 2, 2023

I backport this for parity with 17.0.10-oracle. We should have it in 21 as well.


Progress

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

Issue

  • JDK-8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes? (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 218

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2023

👋 Welcome back goetz! 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 ba1a46392f0b9c77c64278f82513aaf51f5c9b1b 8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes? Oct 2, 2023
@openjdk
Copy link

openjdk bot commented Oct 2, 2023

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

@openjdk
Copy link

openjdk bot commented Oct 2, 2023

⚠️ @GoeLin 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 Oct 2, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2023

Webrevs

@openjdk openjdk bot added the approval label Oct 2, 2023
@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes?

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Oct 3, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Oct 4, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 4, 2023

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

  • bbfbc7b: 8308103: Massive (up to ~30x) increase in C2 compilation time since JDK 17
  • 48fa33a: 8301489: C1: ShortLoopOptimizer might lift instructions before their inputs
  • 89103c6: 8317257: RISC-V: llvm build broken
  • b4bb944: 8316743: RISC-V: Change UseVectorizedMismatchIntrinsic option result to warning

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 4, 2023

@GoeLin Pushed as commit 67d2836.

💡 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