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

8197859: VS2017 Complains about UINTPTR_MAX definition in globalDefinitions_VisCPP.hpp #58

Closed
wants to merge 19 commits into from
Closed

Conversation

apavlyutkin
Copy link
Contributor

@apavlyutkin apavlyutkin commented May 13, 2022

Hi! Please review another backport from MSVS2019 seria. This one fixes type declarations made by globalDefinitions_VisCPP.hpp. The patch from 11u applied with the following changes:

  • inttypes.h is included conditionally under _MSC_VER >= 1800 because the header was introduced only in MSVS 2013 but we have to keep support of the earlier MSVS versions
  • the duplicates of declarations made in inttypes.h are not just removed but quoted with _MSC_VER < 1800
  • common\autoconf\generated-configure.sh is regenerated to add MSVS2019 recognition (I forgot to do that in 8221988: add possibility to build with Visual Studio 2019 #33)

Verification: 2019 build (both 32/64) now fails with

ad_x86_64_pipeline.obj : error LNK2011: precompiled object not linked in; image may not run
jvm.dll : fatal error LNK1120: 1 unresolved externals

error (to be fixed by backport of 8043492)

Regression: 2017/2013/2012/2010 full build - ok

@kimbarrett @dholmes-ora if you took a look at that it would be very much appreciated


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-8197859: VS2017 Complains about UINTPTR_MAX definition in globalDefinitions_VisCPP.hpp

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 58

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 13, 2022

👋 Welcome back apavlyutkin! 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 b8ab854bdcf625772e965a5e476e0a9db1b91f3f 8197859: VS2017 Complains about UINTPTR_MAX definition in globalDefinitions_VisCPP.hpp May 13, 2022
@openjdk
Copy link

openjdk bot commented May 13, 2022

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

@openjdk openjdk bot added the backport label May 13, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label May 13, 2022
@mlbridge
Copy link

mlbridge bot commented May 13, 2022

Webrevs

@apavlyutkin
Copy link
Contributor Author

ping

mrserb and others added 10 commits May 24, 2022 05:47
Reviewed-by: andrew
Backport-of: f42631e354d4abf7994abd92aa5def6b2ceeab3a
Reviewed-by: phh
Backport-of: 4d45c3ebc493bb2c85dab84b97840c8ba093ab1f
Backport-of: a95482acf83cc03bc562baace0d55d831d0b2b41
Reviewed-by: sgehwolf
Backport-of: b05d4ccf8e54635c16bc2c26aa7a8fcc2e3b3dde
Backport-of: aa90df6f51940a73f9aa078a32768855c8568034
Reviewed-by: phh, zgu
Backport-of: 0b9ff0c3a418070996f61f69165de02d33070f7f
8170385: JDK-8031567 broke source bundles
8170392: JDK-8031567 broke builds from source bundles

Reviewed-by: sgehwolf
Backport-of: 27b7ab8b27a5548ed4cd823d35c8190a594bfdd1
8287508: The tests added to jdk-8 by 8235385 are to be ported to jdk-11

Co-authored-by: Wang Zhuo <wzhuo@openjdk.org>
Co-authored-by: Andrew Haley <aph@openjdk.org>
Reviewed-by: aph, andrew
Backport-of: 156c486e920b1ca406064dd189562b830990f7f9
@apavlyutkin
Copy link
Contributor Author

ping

@openjdk
Copy link

openjdk bot commented Jun 22, 2022

⚠️ @apavlyutkin This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport rfr Pull request is ready for review
8 participants