8324184: Windows VS2010 build failed with "error C2275: 'int64_t'"

[gnu-andrew]

Hi all,

This pull request contains a backport of commit 4d078930 from the openjdk/jdk21u repository.

The commit being backported was authored by Coleen Phillimore on 2 Oct 2023 and had no reviewers.

The backport is primarily for 8u, where the VS2010 build seems to be broken because of the placing of the declarations of low, high and index in JDK-8314295; see https://github.com/gnu-andrew/jdk8u-dev/actions/runs/7549766959/job/20554342418. This is fixed by this private bug fix, JDK-8317331: Solaris build failed with "declaration can not follow a statement (E_DECLARATION_IN_CODE)". However, it makes sense to have the code in sync everywhere and this change is already in 21u: openjdk/jdk21u@4d07893

I don't know if the new approval commands will work with a private bug. I guess we will see. It didn't, so we created a new bug.

Backport was clean and built fine on GNU/Linux with GCC 12.

Thanks!

---

Progress

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

Issue

• JDK-8324184: Windows VS2010 build failed with "error C2275: 'int64_t'" (Bug - P4 - Approved)

Reviewers

• Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2136

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

⚠️ @gnu-andrew the issue with id 8317331 from commit 4d078930eecfacb28a7c8324f233080eaf649334 does not exist in project JDK.

[jerboaa]

@gnu-andrew I think you need to use Backport JDK-8317331 if the bug is private. See https://wiki.openjdk.org/display/SKARA/Backports, section Unknown or Missing Original Commit. In this case I also suggest to use /summary with a Backport-of: 4d078930eecfacb28a7c8324f233080eaf649334 as the bots won't add it.

[gnu-andrew]

@gnu-andrew I think you need to use Backport JDK-8317331 if the bug is private. See https://wiki.openjdk.org/display/SKARA/Backports, section Unknown or Missing Original Commit. In this case I also suggest to use /summary with a Backport-of: 4d078930eecfacb28a7c8324f233080eaf649334 as the bots won't add it.

Thanks. Not sure I've seen that more detailed page before.

[openjdk]

⚠️ @gnu-andrew the issue with id 8317331 does not exist in project JDK.

[jerboaa]

Hmm, not sure why it's not working.

[gnu-andrew]

It may be easier just to file a new bug. Then the backport records would also be visible for 8u & 11u.

[jerboaa]

+1

[mlbridge]

Webrevs

• 00: Full (c27dcc85)

[jerboaa]

Seems fine.

[openjdk]

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[gnu-andrew]

/approval request Additional change from the January security update which fixes new code introduced by a security patch to compile on older C compilers that require declarations to precede statements in a block. Patch applies clean and it is preferable to keep this code consistent across all supported JDKs.

[openjdk]

@gnu-andrew
8324184: The approval request has been created successfully.

[openjdk]

@gnu-andrew 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:

8324184: Windows VS2010 build failed with "error C2275: 'int64_t'"

Reviewed-by: sgehwolf

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

• cac0e96: 8319436: Proxy.newProxyInstance throws NPE if loader is null and interface not visible from class loader
• 1425971: 8322321: Add man page doc for -XX:+VerifySharedSpaces
• 5b2aec6: 8318490: Increase timeout for JDK tests that are close to the limit when run with libgraal
• 67aa1de: 8319213: Compatibility.java reads both stdout and stderr of JdkUtils
• b4f1deb: 8312428: PKCS11 tests fail with NSS 3.91
• b186446: 8317039: Enable specifying the JDK used to run jtreg
• 7c4aaec: 8313206: PKCS11 tests silently skip execution
• 391bd2d: 8309305: sun/security/ssl/SSLSocketImpl/BlockedAsyncClose.java fails with jtreg test timeout
• e9ddb51: 8311581: Remove obsolete code and comments in TestLVT.java
• 8162425: 8307955: Prefer to PTRACE_GETREGSET instead of PTRACE_GETREGS in method 'ps_proc.c::process_get_lwp_regs'
• ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/769708f8c4070c69dea1c8bb6206e433f5a41580...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.

[gnu-andrew]

Thanks Severin.
/integrate

[openjdk]

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

• c774469: 8272811: Document the effects of building with _GNU_SOURCE in os_posix.hpp
• 5a8af23: 8281543: Remove unused code/headerfile dtraceAttacher.hpp
• ab3d1d0: 8323243: JNI invocation of an abstract instance method corrupts the stack
• cac0e96: 8319436: Proxy.newProxyInstance throws NPE if loader is null and interface not visible from class loader
• 1425971: 8322321: Add man page doc for -XX:+VerifySharedSpaces
• 5b2aec6: 8318490: Increase timeout for JDK tests that are close to the limit when run with libgraal
• 67aa1de: 8319213: Compatibility.java reads both stdout and stderr of JdkUtils
• b4f1deb: 8312428: PKCS11 tests fail with NSS 3.91
• b186446: 8317039: Enable specifying the JDK used to run jtreg
• 7c4aaec: 8313206: PKCS11 tests silently skip execution
• ... and 8 more: https://git.openjdk.org/jdk17u-dev/compare/769708f8c4070c69dea1c8bb6206e433f5a41580...master

Your commit was automatically rebased without conflicts.

[openjdk]

@gnu-andrew Pushed as commit 4f80edf.

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