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

JDK-8282345: handle latest VS2022 in abstract_vm_version #7606

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Feb 24, 2022

Hi, please review this small VS-related change.
The latest VS2022 versions should be handled in abstract_vm_version, e.g. 17.0, see
https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170
Additionally, very old VS versions can be removed from abstract_vm_version.

Thanks, Matthias


Progress

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

Issue

  • JDK-8282345: handle latest VS2022 in abstract_vm_version

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7606/head:pull/7606
$ git checkout pull/7606

Update a local copy of the PR:
$ git checkout pull/7606
$ git pull https://git.openjdk.java.net/jdk pull/7606/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7606

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7606.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 24, 2022

👋 Welcome back mbaesken! 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 Feb 24, 2022
@openjdk
Copy link

openjdk bot commented Feb 24, 2022

@MBaesken The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Feb 24, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 24, 2022

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks fine. Removing the old versions is not necessary but probably not harmful either.

I wonder if MS will ever provide an actual version string for their compilers so we don't have to do this every time they get updated.

Thanks,
David

@openjdk
Copy link

openjdk bot commented Feb 24, 2022

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

8282345: handle latest VS2022 in abstract_vm_version

Reviewed-by: dholmes, mdoerr

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:

  • 3efd6aa: 8282347: AARCH64: Untaken branch in has_negatives stub
  • cd36be4: 8206187: javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java fails with Port already in use
  • bf19fc6: 8280357: user.home = "?" when running with systemd DynamicUser=true
  • b6843a1: 8005885: enhance PrintCodeCache to print more data
  • 23995f8: 8281525: Enable Zc:strictStrings flag in Visual Studio build
  • 20e78f7: 8282307: Parallel: Incorrect discovery mode in PCReferenceProcessor
  • 0b6862e: 8282348: Remove unused CardTable::dirty_card_iterate
  • 6fab8a2: 8277204: Implement PAC-RET branch protection on Linux/AArch64
  • abc0ce1: 8282316: Operation before String case conversion
  • 0796620: 8281944: JavaDoc throws java.lang.IllegalStateException: ERRONEOUS
  • ... and 2 more: https://git.openjdk.java.net/jdk/compare/3cfffa4f8e5a0fff7f232130125c549f992b533b...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.

➡️ 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 Feb 24, 2022
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

+1
Visual Studio 2017 is the oldest supported version according to https://openjdk.java.net/groups/build/doc/building.html
So, should be fine to remove a couple of very old ones.

@MBaesken
Copy link
Member Author

Hi David and Martin, thanks for the reviews.

Visual Studio 2017 is the oldest supported
So we could probably also remove some old pre VS2015 workarounds if there are any left in the codebase.

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 25, 2022

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

  • b96b743: 8281015: Further simplify NMT backend
  • 9471f24: 8280684: JfrRecorderService failes with guarantee(num_written > 0) when no space left on device.
  • 3efd6aa: 8282347: AARCH64: Untaken branch in has_negatives stub
  • cd36be4: 8206187: javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java fails with Port already in use
  • bf19fc6: 8280357: user.home = "?" when running with systemd DynamicUser=true
  • b6843a1: 8005885: enhance PrintCodeCache to print more data
  • 23995f8: 8281525: Enable Zc:strictStrings flag in Visual Studio build
  • 20e78f7: 8282307: Parallel: Incorrect discovery mode in PCReferenceProcessor
  • 0b6862e: 8282348: Remove unused CardTable::dirty_card_iterate
  • 6fab8a2: 8277204: Implement PAC-RET branch protection on Linux/AArch64
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/3cfffa4f8e5a0fff7f232130125c549f992b533b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 25, 2022

@MBaesken Pushed as commit 735e86b.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants