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
8277906: Incorrect type for IV phi of long counted loops after CCP #6632
Conversation
👋 Welcome back roland! A progress list of the required criteria for merging this PR into |
There was a problem hiding this 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 but what about this code?
jdk/src/hotspot/share/opto/phaseX.cpp
Lines 1573 to 1575 in 37ff7f3
if (use_op == Op_CmpI) { | |
Node* phi = countedloop_phi_from_cmp((CmpINode*)use, n); | |
if (phi != NULL) { |
Thanks for the review.
Good catch. I didn't notice that one. I think it is specific to int counted loops when the pre/main/post loops are created. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, makes sense.
@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:
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 88 new commits pushed to the
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
@TobiHartmann @chhagedorn thanks for the reviews. |
/integrate |
Going to push as commit 3889af3.
Your commit was automatically rebased without conflicts. |
This failure occurs because the iv phi of a long counted loop has the
wrong type after CCP. That happens because, during CCP, after the type
of the limit of the counted loop is updated, the type of the iv phi is
not recomputed. The fix is to apply to long counted loops the logic
that already exists for int counted loop.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6632/head:pull/6632
$ git checkout pull/6632
Update a local copy of the PR:
$ git checkout pull/6632
$ git pull https://git.openjdk.java.net/jdk pull/6632/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 6632
View PR using the GUI difftool:
$ git pr show -t 6632
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6632.diff