Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Feb 11, 2022

Unclean backport to fix the x86_32 problem. It is not clean, because Panama is not in 11u, so context in .ad is different.

Additional testing:

  • Linux x86_32 fails new test without the fix, passes with it

Progress

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

Issue

  • JDK-8279076: C2: Bad AD file when matching SqrtF with UseSSE=0

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 819

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 11, 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 9d5ae2e38074c3df354aeab19ebbab7d4872165a 8279076: C2: Bad AD file when matching SqrtF with UseSSE=0 Feb 11, 2022
@openjdk
Copy link

openjdk bot commented Feb 11, 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 clean Identical backport; no merge resolution required labels Feb 11, 2022
@openjdk
Copy link

openjdk bot commented Feb 11, 2022

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

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

8279076: C2: Bad AD file when matching SqrtF with UseSSE=0

Reviewed-by: roland, 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 3 new commits pushed to the master branch:

  • 29eb422: 8281520: JFR: A wrong parameter is passed to the constructor of LeakKlassWriter
  • d79e710: 8281599: test/lib/jdk/test/lib/KnownOIDs.java is redundant since JDK-8268801
  • 6c26ba2: 8190748: java/text/Format/DateFormat/DateFormatTest.java and NonGregorianFormatTest fail intermittently

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 11, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 11, 2022

Webrevs

Copy link
Contributor

@rwestrel rwestrel 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.

@shipilev
Copy link
Member Author

Thanks, got the push approval. The GHA failure is known intermittent.

/integrate

@openjdk
Copy link

openjdk bot commented Feb 14, 2022

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

  • 29eb422: 8281520: JFR: A wrong parameter is passed to the constructor of LeakKlassWriter
  • d79e710: 8281599: test/lib/jdk/test/lib/KnownOIDs.java is redundant since JDK-8268801
  • 6c26ba2: 8190748: java/text/Format/DateFormat/DateFormatTest.java and NonGregorianFormatTest fail intermittently

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 14, 2022

@shipilev Pushed as commit bd420d2.

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

@shipilev shipilev deleted the JDK-8279076-x86_32-sqrtf branch April 6, 2022 09:13
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 clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants