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

8248414: AArch64: Remove uses of long and unsigned long ints #215

Closed
wants to merge 5 commits into from

Conversation

VladimirKempik
Copy link

@VladimirKempik VladimirKempik commented Aug 9, 2021

This is a backport of 8248414 to jdk11u-dev

The backport didn't apply clean, partially due to backport of JDK-8247766

It's needed for mac-aarch and win-aarch64 ports

It will be followed by 8250824 and 8251930.

Sections of aarch64.ad file between line 10260-12560 were regenerated from aarch64_ad.m4

Original commit - openjdk/jdk@c7d8485


Progress

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

Issue

  • JDK-8248414: AArch64: Remove uses of long and unsigned long ints

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 215

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 9, 2021

👋 Welcome back vkempik! 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 c7d84850bfdbd112a495fab453a79832e3810f47 8248414: AArch64: Remove uses of long and unsigned long ints Aug 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 9, 2021

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

@openjdk openjdk bot added backport rfr labels Aug 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 9, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Aug 11, 2021

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

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

8248414: AArch64: Remove uses of long and unsigned long ints

Reviewed-by: phh

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 label Aug 11, 2021
@VladimirKempik
Copy link
Author

@VladimirKempik VladimirKempik commented Aug 13, 2021

Hello @phohensee , as this backport is also part of winaarch64 backport, I'm going to withdraw this to not make MS folks to do the job twice, could your repeat your approval there as well, the patches are almost identical #222

@phohensee
Copy link
Member

@phohensee phohensee commented Aug 13, 2021

Yes, this patch is almost identical to a small part of #222, but the latter is huge. I'll take a shot at reviewing it though.

@phohensee
Copy link
Member

@phohensee phohensee commented Aug 13, 2021

On second thought, see my comment on #222. I'd prefer to push this backport separately.

Copy link
Member

@phohensee phohensee left a comment

Did a little more spelunking and found that some of the changes in this patch (e.g., aarch64.ad) are in JDK-8248403. I did a quick backport of that issue, see #246.

@openjdk openjdk bot removed the ready label Aug 13, 2021
@theRealAph
Copy link
Contributor

@theRealAph theRealAph commented Aug 14, 2021

On second thought, see my comment on #222. I'd prefer to push this backport separately.

Yes, definitely. The two integer type cleanup patches were because of Windows/Mac, but they are logically independent of the ports. It really wouldn't help to merge them.
In general, it is a good idea to commit pure cleanups (which these were, in the sense that they had no behavioral effect) separately from functional changes.

@theRealAph
Copy link
Contributor

@theRealAph theRealAph commented Aug 14, 2021

In general, it is a good idea to commit pure cleanups (which these were, in the sense that they had no behavioral effect) separately from functional changes.

Substantial cleanups,I mean. I have no objection to tidying up bits and pieces as we go along,and John Rose has said that we should.

@phohensee
Copy link
Member

@phohensee phohensee commented Aug 19, 2021

Hi, Vladimir. Note that the current patch has a conflict in immediate_aarch64.cpp due to the backport of JDK-8248403.

@phohensee
Copy link
Member

@phohensee phohensee commented Aug 19, 2021

Note that your current patch has a conflict due to the backport of JDK-8248403. Please update the PR.

@VladimirKempik
Copy link
Author

@VladimirKempik VladimirKempik commented Aug 19, 2021

Thanks for heads up! fixed merge conflict

@openjdk openjdk bot added the ready label Aug 19, 2021
@VladimirKempik
Copy link
Author

@VladimirKempik VladimirKempik commented Aug 24, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2021

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

  • dfb67bc: 8248682: AArch64: Use ATTRIBUTE_ALIGNED helper
  • c81c8e8: 8248671: AArch64: Remove unused variables
  • ba097ca: 8251549: Update docs on building for Git
  • 3a88ae7: Merge
  • 3a32efc: Merge
  • fdbaa23: Merge
  • f4772b5: 8272602: [macos] not all KEY_PRESSED events sent when control modifier is used

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 24, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2021

@VladimirKempik Pushed as commit bf01efa.

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

@VladimirKempik VladimirKempik deleted the JDK-8248414_1 branch Aug 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
3 participants