8292352: 32-bit Windows build failures after JDK-8290059

[shipilev]

trafficstars

The affected file was added by JDK-8290059, and the code that fails the compilation is under #ifdef _WIN32, and it only (?) gets compiled for tests. Looks like we really need the "WINAPI" macro in the definition, so that we match the stdcall. See the example declaration in the docs.

Attn @JornVernee.

Additional testing:

• [x] Windows x86_32 builds/test now pass
• [ ] Windows x86_64 builds/test still pass

---

Progress

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

Issue

• JDK-8292352: 32-bit Windows build failures after JDK-8290059

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9875

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

Using diff file

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

[bridgekeeper[bot]]

:wave: Welcome back shade! 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[bot]]

@shipilev To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request. In order to have an "RFR" email sent to the correct mailing list, you will need to add one or more applicable labels manually using the /label pull request command.

Applicable Labels

• build
• client
• compiler
• core-libs
• hotspot
• hotspot-compiler
• hotspot-gc
• hotspot-jfr
• hotspot-runtime
• i18n
• ide-support
• javadoc
• jdk
• jmx
• kulla
• net
• nio
• security
• serviceability
• shenandoah

[shipilev]

Ah, labels. Let's pretend this is the same as JDK-8290059.

/label add core-libs

[openjdk[bot]]

@shipilev The core-libs label was successfully added.

[mlbridge[bot]]

Webrevs

• 00: Full (092272a6)

[openjdk[bot]]

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

8292352: 32-bit Windows build failures after JDK-8290059

Reviewed-by: stuefe

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

• f45b8408a0e66aee22a6ac60e3f24dfc8ac104e5: 8292384: Convert AdapterHandlerTable to ResourceHashtable
• 0c67fba11f444cc3739f66c8a2d57564b5dcca72: 8289049: x86_32 build fails with GCC 11 due to newString646_US warning
• bf7d6d3a0f947ab4a30f27bce6650798289cc7fd: 7132413: [macosx] closed/javax/swing/AbstractButton/5049549/bug5049549.java fails on MacOS
• e230719ad3cc9e70511d7baa6338bb77cd038139: 8292448: Convert BitMapFragmentTable to ResourceHashtable
• f75da2235ab7e33927729fa060ec4d86fdb0240f: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
• 802ef38060080254e55621e4c64fa31a6c0b7b18: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
• e61f6fc3940720f6ebc3ef360e25b880729cfa5a: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
• 0bfb12162f6035559a114176115b91aff6df3b64: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
• 1d9c2f7a6e3e897721ef99af8f383a07148b7c4e: 8292279: (fs) Use try-with-resources to release NativeBuffer
• a25e1dc53cecc5dd917ac0f76fd86ef1f074adba: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
• ... and 22 more: https://git.openjdk.org/jdk/compare/e89abb7d2d902c6e6b3c9953fc6663de10db77b9...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.

[shipilev]

All right, thanks! If there are no other suggestions/complaints, I am going to integrate it.

[shipilev]

/integrate

[openjdk[bot]]

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

• f45b8408a0e66aee22a6ac60e3f24dfc8ac104e5: 8292384: Convert AdapterHandlerTable to ResourceHashtable
• 0c67fba11f444cc3739f66c8a2d57564b5dcca72: 8289049: x86_32 build fails with GCC 11 due to newString646_US warning
• bf7d6d3a0f947ab4a30f27bce6650798289cc7fd: 7132413: [macosx] closed/javax/swing/AbstractButton/5049549/bug5049549.java fails on MacOS
• e230719ad3cc9e70511d7baa6338bb77cd038139: 8292448: Convert BitMapFragmentTable to ResourceHashtable
• f75da2235ab7e33927729fa060ec4d86fdb0240f: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
• 802ef38060080254e55621e4c64fa31a6c0b7b18: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
• e61f6fc3940720f6ebc3ef360e25b880729cfa5a: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
• 0bfb12162f6035559a114176115b91aff6df3b64: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
• 1d9c2f7a6e3e897721ef99af8f383a07148b7c4e: 8292279: (fs) Use try-with-resources to release NativeBuffer
• a25e1dc53cecc5dd917ac0f76fd86ef1f074adba: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
• ... and 22 more: https://git.openjdk.org/jdk/compare/e89abb7d2d902c6e6b3c9953fc6663de10db77b9...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@shipilev Pushed as commit e81210f5fe03ea3dc9c9fb0dba2be79e1dcc03bc.

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