Skip to content
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

8263227: C2: inconsistent spilling due to dead nodes in exception block #60

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 23, 2021

JDK-8263227 should get backported for parity with 11.0.13-oracle. Doesn't apply cleanly, but resolution is trivial. disconnect_inputs in lcm.cpp needs an additional parameter for the feature to count edges which is not used here.


Progress

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

Issue

  • JDK-8263227: C2: inconsistent spilling due to dead nodes in exception block

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/60/head:pull/60
$ git checkout pull/60

Update a local copy of the PR:
$ git checkout pull/60
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/60/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 60

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/60.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 23, 2021

👋 Welcome back mdoerr! 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 openjdk bot changed the title Backport d81b0461b73eeee648654ff04b2b71269932ad5a 8263227: C2: inconsistent spilling due to dead nodes in exception block Jun 23, 2021
@openjdk
Copy link

openjdk bot commented Jun 23, 2021

This backport pull request has now been updated with issue and summary from the original commit.

@openjdk openjdk bot added the backport label Jun 23, 2021
@TheRealMDoerr TheRealMDoerr marked this pull request as ready for review Jun 23, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 23, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 23, 2021

Webrevs

Copy link
Contributor

@rwestrel rwestrel left a comment

Looks good to me.

@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@TheRealMDoerr This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8263227: C2: inconsistent spilling due to dead nodes in exception block

Eliminate dead nodes created by call-catch cleanup even if they have multiple
projections. Assert that definitions dominate uses and projections are scheduled
next to their parent nodes.

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

  • dcd1044: 8265773: incorrect jdeps message "jdk8internals" to describe a removed JDK internal API

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 24, 2021
@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Jun 24, 2021

Thanks for the review!
/integrate

@openjdk
Copy link

openjdk bot commented Jun 24, 2021

Going to push as commit 48c1f60.
Since your change was applied there has been 1 commit pushed to the master branch:

  • dcd1044: 8265773: incorrect jdeps message "jdk8internals" to describe a removed JDK internal API

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 24, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated labels Jun 24, 2021
@TheRealMDoerr TheRealMDoerr deleted the 8263227_C2 branch Jun 24, 2021
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jun 24, 2021
@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@TheRealMDoerr Pushed as commit 48c1f60.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants