8305222: Change unique_ctrl_out_or_null to unique_ctrl_out in PhaseCFG::convert_NeverBranch_to_Goto

[eme64]

Replaced unique_ctrl_out_or_null with unique_ctrl_out, which asserts if it finds nullptr. This is better than running into a nullptr-dereference inside get_block_for_node.

This was found by a static code analyzer, so it is not clear that a nullptr dereference would ever happen. But let's still fix it.

---

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-8305222: Change unique_ctrl_out_or_null to unique_ctrl_out in PhaseCFG::convert_NeverBranch_to_Goto

Reviewers

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12919

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

Using diff file

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

[bridgekeeper]

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

@eme64 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 (d0349b6a)

[vnkozlov]

Good.

[openjdk]

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

8305222: Change unique_ctrl_out_or_null to unique_ctrl_out in PhaseCFG::convert_NeverBranch_to_Goto

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

• 2d607c9: 8262294: java/net/httpclient/ProxyAuthDisabledSchemes.java fails with HTTP/1.1 parser received no bytes
• b3ff8d1: 8303805: [REDO] JDK-8302189 and JDK-8302799
• b524a74: 8301106: Allow archived Java strings to be moved by GC
• 9643f65: 8304436: com/sun/jdi/ThreadMemoryLeakTest.java fails with "OutOfMemoryError: Java heap space" with ZGC
• 69152c3: 8305202: Fix Copyright Header in ZonedDateTimeFormatterBenchmark
• 438c969: 8304976: Optimize DateTimeFormatterBuilder.ZoneTextPrinterParser.getTree()
• d063b89: 8303392: Runtime.exec and ProcessBuilder.start should use System logger
• be764a7: 8302814: Delete unused CountLoopEnd instruct with CmpX
• 34f4d7f: 8304759: Add BitMap iterators
• 42df1a9: 8304991: Redundant hyphen in @param results in double-dash in javadocs
• ... and 254 more: https://git.openjdk.org/jdk/compare/1e9942aa112edca33f964db127df6c9ce41e86ff...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.

[TobiHartmann]

Looks good to me too but please verify that the static analysis now passes.

[eme64]

@vnkozlov @TobiHartmann Thanks for the reviews!
/integrate

[openjdk]

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

• 2d607c9: 8262294: java/net/httpclient/ProxyAuthDisabledSchemes.java fails with HTTP/1.1 parser received no bytes
• b3ff8d1: 8303805: [REDO] JDK-8302189 and JDK-8302799
• b524a74: 8301106: Allow archived Java strings to be moved by GC
• 9643f65: 8304436: com/sun/jdi/ThreadMemoryLeakTest.java fails with "OutOfMemoryError: Java heap space" with ZGC
• 69152c3: 8305202: Fix Copyright Header in ZonedDateTimeFormatterBenchmark
• 438c969: 8304976: Optimize DateTimeFormatterBuilder.ZoneTextPrinterParser.getTree()
• d063b89: 8303392: Runtime.exec and ProcessBuilder.start should use System logger
• be764a7: 8302814: Delete unused CountLoopEnd instruct with CmpX
• 34f4d7f: 8304759: Add BitMap iterators
• 42df1a9: 8304991: Redundant hyphen in @param results in double-dash in javadocs
• ... and 254 more: https://git.openjdk.org/jdk/compare/1e9942aa112edca33f964db127df6c9ce41e86ff...master

Your commit was automatically rebased without conflicts.

[openjdk]

@eme64 Pushed as commit 77811fa.

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