Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented May 2, 2022

Unclean backport to fix Blackhole behavior. The test does not work until we add another IRNode constant.

Additional testing:

  • New test passes with the fix, fails without it

Progress

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

Issue

  • JDK-8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 377

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 2, 2022

👋 Welcome back shade! 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 ce8db2c40378de01ce35ca37ec315af47974d6d6 8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id() May 2, 2022
@openjdk
Copy link

openjdk bot commented May 2, 2022

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels May 2, 2022
@mlbridge
Copy link

mlbridge bot commented May 2, 2022

Webrevs

Copy link

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

good

@openjdk
Copy link

openjdk bot commented May 2, 2022

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

8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()

Reviewed-by: kvn

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 May 2, 2022
@shipilev
Copy link
Member Author

shipilev commented May 4, 2022

The test failure is unrelated. Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented May 4, 2022

Going to push as commit 0955aca.
Since your change was applied there have been 2 commits pushed to the master branch:

  • db26df6: 8284549: JFR: FieldTable leaks FieldInfoTable member
  • a1da138: 8284620: CodeBuffer may leak _overflow_arena

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 4, 2022
@openjdk openjdk bot closed this May 4, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 4, 2022
@openjdk
Copy link

openjdk bot commented May 4, 2022

@shipilev Pushed as commit 0955aca.

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

@shipilev shipilev deleted the JDK-8285394-blackhole-id branch June 22, 2022 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants