Skip to content

Conversation

@chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Dec 10, 2025

There are a lot of places in the code where we call proj_out*(true/false) on an IfNode. In some cases, we then cast the returned ProjNode back to IfProjNode or IfTrueNode/IfFalseNode. I often visit such code and now decided to clean this up.

The patch proposes new IfNode::true/false_proj*() methods that return IfTrueNode/IfFalseNode directly. I walked through all proj_out*() calls and replaced those that used a direct true/false or 1/0 as argument.

There are still more things to clean up in this area, for example, when we return ProjNode even though it should be an IfProjNode which requires more casting. But let's do that step by step in follow-up clean ups.

Thanks,
Christian


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-8373420: C2: Add true/false_proj*() methods for IfNode as a replacement for proj_out*(true/false) (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28745

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 10, 2025

👋 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
Copy link

openjdk bot commented Dec 10, 2025

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

8373420: C2: Add true/false_proj*() methods for IfNode as a replacement for proj_out*(true/false)

Reviewed-by: dfenacci, roland

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 23 new commits pushed to 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.

# Conflicts:
#	src/hotspot/share/opto/castnode.cpp
#	src/hotspot/share/opto/castnode.hpp
@openjdk
Copy link

openjdk bot commented Dec 10, 2025

@chhagedorn this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8373420
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch hotspot-compiler [email protected] labels Dec 10, 2025
@openjdk
Copy link

openjdk bot commented Dec 10, 2025

@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.

@openjdk openjdk bot added rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Dec 10, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 10, 2025

Webrevs

Copy link
Contributor

@dafedafe dafedafe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice cleanup. Thanks @chhagedorn. Looks good to me.

@chhagedorn
Copy link
Member Author

Thanks Damon for your review!

Copy link
Contributor

@rwestrel rwestrel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-compiler [email protected] ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants