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

[rwestrel]

PhaseIdealLoop::try_sink_out_of_loop() has special logic to handle
AddP nodes so, after it has been processed, all nodes in the chain
of AddP nodes still have the same base input. That logic assumes a
chain is only composed of at most 2 nodes. That's not true because
PhaseIdealLoop::remix_address_expressions() can cause longer chains
to exist. There's actually no clear upper bound on the number of nodes
in such a chain. The fix I propose here is simply to extend the logic
in PhaseIdealLoop::try_sink_out_of_loop() to handle arbitrary
chains.

---

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-8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes? (Bug - P3)

Reviewers

• Christian Hagedorn (@chhagedorn - Reviewer)
• Vladimir Kozlov (@vnkozlov - Reviewer)
• Tobias Hartmann (@TobiHartmann - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15562

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

@rwestrel The following label will be automatically applied to this pull request:

• hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (8eebf75a)

[chhagedorn]

Looks good!

[openjdk]

@rwestrel 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?

Reviewed-by: chagedorn, kvn, thartmann

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

• 5cbff24: 8315406: [REDO] serviceability/jdwp/AllModulesCommandTest.java ignores VM flags
• 7a08e6b: 8313575: Refactor PKCS11Test tests
• d3ee704: 8315563: Remove references to JDK-8226420 from problem list
• aba89f2: 8312213: Remove unnecessary TEST instructions on x86 when flags reg will already be set
• 1f4cdb3: 8315127: CDSMapTest fails with incorrect number of oop references
• 939d7c5: 8161536: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with ProviderException
• ebe3127: 8315717: ProblemList serviceability/sa/TestHeapDumpForInvokeDynamic.java with ZGC
• 969fcdb: 8314191: C2 compilation fails with "bad AD file"
• cef9fff: 8305507: Add support for grace period before AbortVMOnSafepointTimeout triggers
• ed2b467: 8315499: build using devkit on Linux ppc64le RHEL puts path to devkit into libsplashscreen
• ... and 172 more: https://git.openjdk.org/jdk/compare/8939d15d92982300f090bc1c51f59550529eaaf3...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.

[vnkozlov]

Looks good to me too.

[TobiHartmann]

Looks good to me too.

[rwestrel]

@chhagedorn @vnkozlov @TobiHartmann thanks for the reviews.

[rwestrel]

/integrate

[openjdk]

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

• a258fc4: 8315648: Add test for JDK-8309979 changes
• 5d3fdc1: 8315612: RISC-V: intrinsic for unsignedMultiplyHigh
• 5cbff24: 8315406: [REDO] serviceability/jdwp/AllModulesCommandTest.java ignores VM flags
• 7a08e6b: 8313575: Refactor PKCS11Test tests
• d3ee704: 8315563: Remove references to JDK-8226420 from problem list
• aba89f2: 8312213: Remove unnecessary TEST instructions on x86 when flags reg will already be set
• 1f4cdb3: 8315127: CDSMapTest fails with incorrect number of oop references
• 939d7c5: 8161536: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with ProviderException
• ebe3127: 8315717: ProblemList serviceability/sa/TestHeapDumpForInvokeDynamic.java with ZGC
• 969fcdb: 8314191: C2 compilation fails with "bad AD file"
• ... and 174 more: https://git.openjdk.org/jdk/compare/8939d15d92982300f090bc1c51f59550529eaaf3...master

Your commit was automatically rebased without conflicts.

[openjdk]

@rwestrel Pushed as commit ba1a463.

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