Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Dec 21, 2021

Unclean backport to fix the potential C2 bug. The uncleanliness comes from the fact that JDK-8273454 is missing in 17, therefore its hunk is ignored. But the other change, JDK-8263006 is present in 17, which still introduces the bug this fix addresses.

Additional testing:

  • Linux x86_64 fastdebug tier1
  • Linux x86_64 fastdebug tier1
  • Linux x86_64 fastdebug tier3

Progress

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

Issue

  • JDK-8274130: C2: MulNode::Ideal chained transformations may act on wrong nodes

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 21, 2021

👋 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 756d22c3563ac92e74bb68d5eecb86d4fbab2c6b 8274130: C2: MulNode::Ideal chained transformations may act on wrong nodes Dec 21, 2021
@openjdk
Copy link

openjdk bot commented Dec 21, 2021

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Dec 21, 2021
@shipilev shipilev marked this pull request as ready for review December 21, 2021 19:36
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 21, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 21, 2021

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.

Backport changes look good.

@openjdk
Copy link

openjdk bot commented Dec 21, 2021

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

8274130: C2: MulNode::Ideal chained transformations may act on wrong nodes

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 Dec 21, 2021
@shipilev
Copy link
Member Author

Backport changes look good.

Thanks! I tagged it for 17u approval.

@shipilev
Copy link
Member Author

shipilev commented Jan 3, 2022

Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented Jan 3, 2022

Going to push as commit 256356d.
Since your change was applied there have been 27 commits pushed to the master branch:

  • 8ce6877: 8279011: JFR: JfrChunkWriter incorrectly handles int64_t chunk size as size_t
  • 0a538a0: 8276662: Scalability bottleneck in SymbolTable::lookup_common()
  • 38f01a7: 8275536: Add test to check that File::lastModified returns same time stamp as Files.getLastModifiedTime
  • 611a0ea: 8273895: compiler/ciReplay/TestVMNoCompLevel.java fails due to wrong data size with TieredStopAtLevel=2,3
  • dcd9821: 8272167: AbsPathsInImage.java should skip *.dSYM directories
  • 493a78a: 8270874: JFrame paint artifacts when dragged from standard monitor to HiDPI monitor
  • f016e60: 8275610: C2: Object field load floats above its null check resulting in a segfault
  • 3adb3dd: 8278099: two sun/security/pkcs11/Signature tests failed with AssertionError
  • 38fdf4f: 8276623: JDK-8275650 accidentally pushed "out" file
  • d30b6e4: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • ... and 17 more: https://git.openjdk.java.net/jdk17u-dev/compare/cc4a0b1ebf20b43b951b11eb562dc56ee69461c7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 3, 2022

@shipilev Pushed as commit 256356d.

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

@shipilev shipilev deleted the JDK-8274130-c2-chained branch January 4, 2022 10:17
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