8248668: AArch64: Avoid MIN/MAX macros when using MSVC

[rnkovacs]

Changes apply cleanly. Testing: tier1.

This is part of the Windows/AArch64 port.

---

Progress

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

Issue

• JDK-8248668: AArch64: Avoid MIN/MAX macros when using MSVC

Contributors

• Monica Beckwith <mbeckwit@openjdk.org>
• Ludovic Henry <luhenry@openjdk.org>
• Bernhard Urban-Forster <burban@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 263

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

Using diff file

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

[bridgekeeper]

👋 Welcome back rnkovacs! 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]

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

[openjdk]

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

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

8248668: AArch64: Avoid MIN/MAX macros when using MSVC

MSVC employs min/max as macros

Co-authored-by: Monica Beckwith <mbeckwit@openjdk.org>
Co-authored-by: Ludovic Henry <luhenry@openjdk.org>
Co-authored-by: Bernhard Urban-Forster <burban@openjdk.org>

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

• c816276: 8241336: Some java.net tests failed with NoRouteToHostException on MacOS with special network configuration
• 910e24b: 8212718: Refactor some annotation processor tests to better use collections
• 5792854: 8212695: Add explicit timeout to several HTTP Client tests
• e5ec679: 8211325: test/jdk/java/net/Socket/LingerTest.java fails with cleaning up
• 7100a65: 8169246: java/net/DatagramSocket/ReportSocketClosed.java fails intermittently with BindException
• 069b4cc: 8199931: java/net/MulticastSocket/UnreferencedMulticastSockets.java fails with "incorrect data received"
• 45ed9e8: 8263490: [macos] Crash occurs on JPasswordField with activated InputMethod
• 7c872ed: 8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
• cb0775f: 8269934: RunThese24H.java failed with EXCEPTION_ACCESS_VIOLATION in java_lang_Thread::get_thread_status
• 5d1b9bb: 8233790: Forward output from heap dumper to jcmd/jmap
• ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/7cafcf4c34bef00fceb295f17877f88ff8c7e0bb...master

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.

➡️ 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).

[rnkovacs]

/contributor add Bernhard Urban-Forster burban@openjdk.org

[openjdk]

@rnkovacs Could not parse Bernhard Urban-Forster burban@openjdk.org as a valid contributor.
Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

• /contributor add @openjdk-bot
• /contributor add duke
• /contributor add J. Duke <duke@openjdk.org>

[mlbridge]

Webrevs

• 01: Full - Incremental (cda127b3)
• 00: Full (7c70d350)

[luhenry]

@rnkovacs could we also attribute the contributor to the author of the change on jdk/jdk (monica.beckwith@microsoft.com, luhenry@openjdk.org)? Thank you!

[rnkovacs]

Hi @luhenry, sorry, I was trying to follow the new SKARA Backports doc saying "Note that author metadata recorded in the backport commit is the author of the backport commit, not the author of the original commit. Likewise the reviewers recorded in the commit message are the reviewers of the backport commit, not the reviewers of the original commit." I am more than happy to add you two though if that's OK with everyone.

[rnkovacs]

/contributor add Monica Beckwith mbeckwit@openjdk.org
/contributor add Ludovic Henry luhenry@openjdk.org

[openjdk]

@rnkovacs
Contributor Monica Beckwith <mbeckwit@openjdk.org> successfully added.

[openjdk]

@rnkovacs
Contributor Ludovic Henry <luhenry@openjdk.org> successfully added.

[rnkovacs]

/contributor add Bernhard Urban-Forster burban@openjdk.org

[openjdk]

@rnkovacs
Contributor Bernhard Urban-Forster <burban@openjdk.org> successfully added.

[luhenry]

@rnkovacs I was not aware of SKARA Backports doc, thanks for pointing it out. Up to you then! And thank you for backporting all of that to JDK 11, can't wait to try it out :)

[rnkovacs]

/integrate

[openjdk]

@rnkovacs
Your change (at version 7c70d35) is now ready to be sponsored by a Committer.

[rnkovacs]

I'm not sure what's up with the Windows x64 hotspot test failure (it says STATUS:Passed., times out, and produces a seemingly empty newfailures.txt at the same time), but this patch only touches AArch64-related files.

[RealCLanger]

I'm not sure what's up with the Windows x64 hotspot test failure (it says STATUS:Passed., times out, and produces a seemingly empty newfailures.txt at the same time), but this patch only touches AArch64-related files.

You can try to merge master into this PR. With that GHA will run again and we can check if it occurs again. Please do so and I'll sponsor the change if the issue is not reproduced.

[phohensee]

Reka, you need to add another /integrate comment in order for /sponsor to work.

[rnkovacs]

/integrate

[openjdk]

@rnkovacs
Your change (at version cda127b) is now ready to be sponsored by a Committer.

[rnkovacs]

Thank you, Paul.

[RealCLanger]

/sponsor

[openjdk]

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

• 9719270: 8248666: AArch64: Use THREAD_LOCAL instead of __thread
• c816276: 8241336: Some java.net tests failed with NoRouteToHostException on MacOS with special network configuration
• 910e24b: 8212718: Refactor some annotation processor tests to better use collections
• 5792854: 8212695: Add explicit timeout to several HTTP Client tests
• e5ec679: 8211325: test/jdk/java/net/Socket/LingerTest.java fails with cleaning up
• 7100a65: 8169246: java/net/DatagramSocket/ReportSocketClosed.java fails intermittently with BindException
• 069b4cc: 8199931: java/net/MulticastSocket/UnreferencedMulticastSockets.java fails with "incorrect data received"
• 45ed9e8: 8263490: [macos] Crash occurs on JPasswordField with activated InputMethod
• 7c872ed: 8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
• cb0775f: 8269934: RunThese24H.java failed with EXCEPTION_ACCESS_VIOLATION in java_lang_Thread::get_thread_status
• ... and 3 more: https://git.openjdk.java.net/jdk11u-dev/compare/7cafcf4c34bef00fceb295f17877f88ff8c7e0bb...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealCLanger @rnkovacs Pushed as commit 63fc945.

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