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-8295412 : support latest VS2022 MSC_VER in abstract_vm_version.cpp #10727

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Oct 17, 2022

Currently the latest VS2022 versions are not supported when checking _MSC_VER in abstract_vm_version.cpp, that should be improved.
See
https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170
https://learn.microsoft.com/de-de/visualstudio/install/visual-studio-build-numbers-and-release-dates?view=vs-2022
Visual Studio 2022 version 17.3 1933
Visual Studio 2022 version 17.2 1932


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8295412: support latest VS2022 MSC_VER in abstract_vm_version.cpp

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10727/head:pull/10727
$ git checkout pull/10727

Update a local copy of the PR:
$ git checkout pull/10727
$ git pull https://git.openjdk.org/jdk pull/10727/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10727

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10727.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 17, 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 Oct 17, 2022
@openjdk
Copy link

openjdk bot commented Oct 17, 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 Oct 17, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 17, 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 and trivial.

It is so annoying we need to do this. :(

@openjdk
Copy link

openjdk bot commented Oct 18, 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:

8295412: support latest VS2022 MSC_VER in abstract_vm_version.cpp

Reviewed-by: dholmes, lucy

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:

  • c33ca0c: 6229853: BasicTextAreaUI:create incompletely documents the possible returned View types
  • 358ac07: 8294254: [macOS] javax/swing/plaf/aqua/CustomComboBoxFocusTest.java failure
  • 490fcd0: 8293833: Error mixing types with -XX:+UseCMoveUnconditionally -XX:+UseVectorCmov
  • 529cc48: 8295396: RISC-V: Cleanup useless CompressibleRegions
  • 692cdab: 8295016: Make the arraycopy_epilogue signature consistent with its usage
  • 21a825e: 8288387: GetLocalXXX/SetLocalXXX spec should require suspending target thread
  • 8d751de: 8295231: Move all linking of native libraries to make
  • f300ec8: 8294546: document where javac differs when invoked via launcher and ToolProvider
  • b269c51: 8295395: Linux Alpha Zero builds fail after JDK-8292591
  • ae60599: 8295023: Interpreter(AArch64): Implement -XX:+PrintBytecodeHistogram and -XX:+PrintBytecodePairHistogram options
  • ... and 2 more: https://git.openjdk.org/jdk/compare/ec2981b83bc3ef6977b5f16d5222eb49b0ea49ad...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 Oct 18, 2022
Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM.

@MBaesken
Copy link
Member Author

Hi David and Lutz, thanks for the reviews !

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 18, 2022

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

  • c33ca0c: 6229853: BasicTextAreaUI:create incompletely documents the possible returned View types
  • 358ac07: 8294254: [macOS] javax/swing/plaf/aqua/CustomComboBoxFocusTest.java failure
  • 490fcd0: 8293833: Error mixing types with -XX:+UseCMoveUnconditionally -XX:+UseVectorCmov
  • 529cc48: 8295396: RISC-V: Cleanup useless CompressibleRegions
  • 692cdab: 8295016: Make the arraycopy_epilogue signature consistent with its usage
  • 21a825e: 8288387: GetLocalXXX/SetLocalXXX spec should require suspending target thread
  • 8d751de: 8295231: Move all linking of native libraries to make
  • f300ec8: 8294546: document where javac differs when invoked via launcher and ToolProvider
  • b269c51: 8295395: Linux Alpha Zero builds fail after JDK-8292591
  • ae60599: 8295023: Interpreter(AArch64): Implement -XX:+PrintBytecodeHistogram and -XX:+PrintBytecodePairHistogram options
  • ... and 2 more: https://git.openjdk.org/jdk/compare/ec2981b83bc3ef6977b5f16d5222eb49b0ea49ad...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 18, 2022

@MBaesken Pushed as commit bca7ab3.

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

@magicus
Copy link
Member

magicus commented Oct 20, 2022

@dholmes-ora Why do you do this? If it needs to be done it should probably be extracted by the build system and sent into Hotspot as a define. But before I'd try to fix that, the first question is: do we really need this value?

@dholmes-ora
Copy link
Member

@magicus it is used to report the compiler version in hotspot internal version string (-Xinternalversion) in a clear way i.e.

MS VC++ 17.3 (VS2022)

versus

unknown MS VC++:  1933

AFAIK MSC doesn't provide any exported means to map the build numbers back to a nice version string like this.

@magicus
Copy link
Member

magicus commented Oct 21, 2022

Sorry, I was unclear. Yes, I know it is used for the version string.

My question was more: I know this has traditionally been included in the version string, but is it really needed? What is the use case for having the compiler version? I can fully understand if this is included in a hs_err file, but in that case, maybe the simple "1933" value can suffice, and if the compiler version is suspected to be bad, we can look it up in a table.

@dholmes-ora
Copy link
Member

is it really needed?

I assume it was desirable to have it hence it was added. I can't attest to the exact why. It was added by JDK-4286737 back in March 2000.

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
4 participants