Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk16 Public archive

8258790: C2: Crash on empty macro node list #56

Closed
wants to merge 2 commits into from
Closed

8258790: C2: Crash on empty macro node list #56

wants to merge 2 commits into from

Conversation

iwanowww
Copy link
Contributor

@iwanowww iwanowww commented Dec 21, 2020

The fix for 8257624 is incomplete: it doesn't cover the case when macro node array becomes empty as a result of multiple nodes removal. In such case, the out-of-bounds access still takes place (at index "-1").

Proposed fix is to adjust the index before performing "i > 0" check.

Testing:

  • failing tests
  • hs-precheckin-comp, hs-tier1, hs-tier2

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk16 pull/56/head:pull/56
$ git checkout pull/56

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 21, 2020

👋 Welcome back vlivanov! 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 21, 2020

@iwanowww 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 the hotspot-compiler hotspot-compiler-dev@openjdk.java.net label Dec 21, 2020
@iwanowww iwanowww marked this pull request as ready for review December 21, 2020 19:41
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 21, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 21, 2020

Webrevs

src/hotspot/share/opto/macro.cpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Dec 21, 2020

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

8258790: C2: Crash on empty macro node list

Reviewed-by: kvn, chagedorn

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 21, 2020
Copy link
Member

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

@iwanowww
Copy link
Contributor Author

Thanks for the reviews, Vladimir and Christian.

@iwanowww
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this Dec 22, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 22, 2020
@openjdk
Copy link

openjdk bot commented Dec 22, 2020

@iwanowww Pushed as commit 772addf.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.java.net integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants