8289051: C2: Cleanup PhaseCCP::analyze()

[chhagedorn]

trafficstars

As part of JDK-8288683, which went into JDK 19, I separated out most of the included refactorings into this cleanup RFE to make the fix as small as possible.

This cleanup includes:

• More comments and better descriptions.
• Renamed some variables.
• Split code into multiple methods to improve the readability.

Thanks, Christian

---

Progress

• [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• [x] Change must not contain extraneous whitespace
• [x] Commit message must refer to an issue

Issue

• JDK-8289051: C2: Cleanup PhaseCCP::analyze()

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9833

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

Using diff file

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

[bridgekeeper[bot]]

:wave: Welcome back chagedorn! 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[bot]]

@chhagedorn 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[bot]]

Webrevs

• 01: Full - Incremental (ab4a0c39)
• 00: Full (5ba8f725)

[openjdk[bot]]

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

8289051: C2: Cleanup PhaseCCP::analyze()

Reviewed-by: thartmann, kvn

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

• 494d3873b1d0f7e3ca0a063b44362e7242298dec: 8280152: AArch64: Reuse runtime call trampolines
• 8b4e6ba01ffef77d5f1b9a9aa3e978f4da431836: 8289332: Auto-generate ids for user-defined headings
• 0fc92637d297d9a1281df33089975bd6d5fdf809: 8291828: Reduce runtime of java.util.stream microbenchmarks
• e81210f5fe03ea3dc9c9fb0dba2be79e1dcc03bc: 8292352: 32-bit Windows build failures after JDK-8290059
• f45b8408a0e66aee22a6ac60e3f24dfc8ac104e5: 8292384: Convert AdapterHandlerTable to ResourceHashtable
• 0c67fba11f444cc3739f66c8a2d57564b5dcca72: 8289049: x86_32 build fails with GCC 11 due to newString646_US warning
• bf7d6d3a0f947ab4a30f27bce6650798289cc7fd: 7132413: [macosx] closed/javax/swing/AbstractButton/5049549/bug5049549.java fails on MacOS
• e230719ad3cc9e70511d7baa6338bb77cd038139: 8292448: Convert BitMapFragmentTable to ResourceHashtable
• f75da2235ab7e33927729fa060ec4d86fdb0240f: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
• 802ef38060080254e55621e4c64fa31a6c0b7b18: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
• ... and 101 more: https://git.openjdk.org/jdk/compare/20123ea4de702ccbaf4c500ff7a1000ca7ee9c90...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.

[chhagedorn]

Thanks Tobias for your review!

[chhagedorn]

Thanks Vladimir for your review!

/integrate

[openjdk[bot]]

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

• 32d675ca607d341ca3428efc32e212701775e3c6: 8291775: C2: assert(r != __null && r->is_Region()) failed: this phi must have a region
• 0d96546ab93600f17877e5db2770e4125916bcda: 8292054: Test runtime/posixSig/TestPosixSig.java fails with 'Test failed, bad output.'
• e8bc87956abc92851de8694c56a78f6ecc546cbd: 8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases
• 494d3873b1d0f7e3ca0a063b44362e7242298dec: 8280152: AArch64: Reuse runtime call trampolines
• 8b4e6ba01ffef77d5f1b9a9aa3e978f4da431836: 8289332: Auto-generate ids for user-defined headings
• 0fc92637d297d9a1281df33089975bd6d5fdf809: 8291828: Reduce runtime of java.util.stream microbenchmarks
• e81210f5fe03ea3dc9c9fb0dba2be79e1dcc03bc: 8292352: 32-bit Windows build failures after JDK-8290059
• f45b8408a0e66aee22a6ac60e3f24dfc8ac104e5: 8292384: Convert AdapterHandlerTable to ResourceHashtable
• 0c67fba11f444cc3739f66c8a2d57564b5dcca72: 8289049: x86_32 build fails with GCC 11 due to newString646_US warning
• bf7d6d3a0f947ab4a30f27bce6650798289cc7fd: 7132413: [macosx] closed/javax/swing/AbstractButton/5049549/bug5049549.java fails on MacOS
• ... and 104 more: https://git.openjdk.org/jdk/compare/20123ea4de702ccbaf4c500ff7a1000ca7ee9c90...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@chhagedorn Pushed as commit 2ee9491a60c956da94debfbf0195f9339403ea98.

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