-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
8257624: C2: PhaseMacroExpand::eliminate_macro_nodes() crashes on out-of-bounds access into macro node array #1572
Conversation
…-of-bounds access into macro node array
👋 Welcome back vlivanov! 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!
@iwanowww 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 26 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 |
Thanks for the reviews, Nils and Vladimir. |
/integrate |
@iwanowww Since your change was applied there have been 67 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit fbdc187. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Elimination of a single macro node may trigger removal of some other macro nodes (e.g., see
PhaseMacroExpand::process_users_of_allocation()
which can eliminateAllocateCopy
if it is a user ofAllocate
node being scalar replaced). ButPhaseMacroExpand::eliminate_macro_nodes()
doesn't take it into account: it iterates over the array backwards one by one and if it is unfortunate to eliminate multiple elements when it is at the very end of the array, it crashes on an out-of-bounds access.The fix is to adjust current position on every iteration. If there are multiple elements removed, current position can point at an element which is already processed, but that's benign.
Testing:
Progress
Issue
Reviewers
Download
$ git fetch https://git.openjdk.java.net/jdk pull/1572/head:pull/1572
$ git checkout pull/1572