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

8282347: AARCH64: Untaken branch in has_negatives stub #659

Closed
wants to merge 1 commit into from

Conversation

bulasevich
Copy link

@bulasevich bulasevich commented Sep 8, 2022

Backport 3efd6aa4c9b6420520709281ab1ca46ba4242c87

A trivial change. Helps JDK-8281146 backport merge issues.


Progress

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

Issue

  • JDK-8282347: AARCH64: Untaken branch in has_negatives stub

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/659/head:pull/659
$ git checkout pull/659

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 659

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/659.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 8, 2022

👋 Welcome back bulasevich! 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 added the rfr Pull request is ready for review label Sep 8, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 8, 2022

Webrevs

@openjdk-notifier
Copy link

@bulasevich Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Sep 8, 2022

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

8282347: AARCH64: Untaken branch in has_negatives stub

Reviewed-by: phh, dsamersoff

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 2 new commits pushed to the master branch:

  • 02fa363: 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance
  • f0acd72: 8275535: Retrying a failed authentication on multiple LDAP servers can lead to users blocked

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee, @dsamersoff) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 8, 2022
@openjdk-notifier
Copy link

@bulasevich Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@RealCLanger
Copy link
Contributor

same here, please rename PR

@bulasevich bulasevich changed the title 8282347: AARCH64: Untaken branch in has_negatives stub Backport 3efd6aa4c9b6420520709281ab1ca46ba4242c87 Sep 12, 2022
@openjdk openjdk bot changed the title Backport 3efd6aa4c9b6420520709281ab1ca46ba4242c87 8282347: AARCH64: Untaken branch in has_negatives stub Sep 12, 2022
@openjdk
Copy link

openjdk bot commented Sep 12, 2022

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

@bulasevich
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 13, 2022
@openjdk
Copy link

openjdk bot commented Sep 13, 2022

@bulasevich
Your change (at version 076a289) is now ready to be sponsored by a Committer.

@dsamersoff
Copy link

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 13, 2022

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

  • 36dd0a7: 8270848: Redundant unsafe opmask register allocation in some instruction patterns.
  • 02fa363: 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance
  • f0acd72: 8275535: Retrying a failed authentication on multiple LDAP servers can lead to users blocked

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 13, 2022

@dsamersoff @bulasevich Pushed as commit 486cffe.

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

@RealCLanger
Copy link
Contributor

Same here, please add jdk17u-fix-request retroactively.

@GoeLin
Copy link
Member

GoeLin commented Sep 16, 2022

@dsamersoff @bulasevich
Please follow the process. File fix requests and give a good reason why these changes
are needed, or just back out the changes.

@theRealAph
Copy link

@dsamersoff @bulasevich Please follow the process. File fix requests and give a good reason why these changes are needed, or just back out the changes.

I can't think of any reason that this should qualify for a backport.

@bulasevich
Copy link
Author

Dear all,

My bad, I pushed the fix after PR review and completely forgot the review label mechanism. I am really sorry.

Let me ask for jdk17u-fix-request in correspondent JBS records records now. If the request is declined, I am ready to back out the changes.

I believe the changes I have pushed ([1] [2] [3]) are trivial, safe and harmless. The reason to bring them is a preparation for a big backport I want to propose - my goal is to bring the StringCoding.countPositives change [4] which has a dependencies:

+ commit 71ca0c08f09e87673f1cf3f918a0802961359166
+ 8270848: Redundant unsafe opmask register allocation in some instruction patterns.
|
| + commit 3efd6aa4c9b6420520709281ab1ca46ba4242c87
| + 8282347: AARCH64: Untaken branch in has_negatives stub
| |
| | + commit e314a4cfda30cc680b3f0aef8c62b75ff81bdbb1
| | + 8280124: Reduce branches decoding latin-1 chars from UTF-8 encoded bytes
| | |
| | |\
| | | + commit d4d12ad1d92ae6d353ce9e16b1b72e6416874cd6
| | | + 8282047: Enhance StringDecode/Encode microbenchmarks
 \ \ \ \
  +-+-+-+-+ commit beedae1141b6b650dc4cedf1f038afc1c8b460dd
          + 8281146: Replace StringCoding.hasNegatives with countPositives

[1] #657
[2] #658
[3] #659
[4] https://bugs.openjdk.org/browse/JDK-8281146

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