8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition

[dholmes-ora]

Trivial fix to add JNICALL to the function declaration.

This will be backported to JDK 22.

Testing:

• tier1 sanity builds

Thanks

---

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-8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition (Bug - P3)

Reviewers

• Vladimir Kozlov (@vnkozlov - Reviewer)
• Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19406

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

@dholmes-ora 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:

8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition

Reviewed-by: kvn, shade

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

• be1d374: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
• ed81a47: 8327964: Simplify BigInteger.implMultiplyToLen intrinsic
• 08face8: 8332890: Module imports don't work inside the same module
• 793fd72: 8332956: Problem list CodeCacheFullCountTest.java until JDK-8332954 is fixed
• 891d5ae: 8332683: G1: G1CardSetArray::EntryDataType [2] triggers ubsan runtime errors
• f3d6fbf: 8330847: G1 accesses uninitialized memory when predicting eden copy time
• 1b8dea4: 8332894: ubsan: vmError.cpp:2090:26: runtime error: division by zero
• 0e7ea39: 8332678: Serial: Remove use of should_clear_all_soft_refs in serial folder
• 72fbfe1: 8330577: G1 sometimes sends jdk.G1HeapRegionTypeChange for non-changes
• 0889155: 8332885: Clarify failure_handler self-tests
• ... and 170 more: https://git.openjdk.org/jdk/compare/5053b70a7fc67ce9b73dbeecbdd88fbc34d45e04...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]

@dholmes-ora The following label will be automatically applied to this pull request:

• hotspot

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.

[mlbridge]

Webrevs

• 00: Full (7c964b86)

[vnkozlov]

Looks good.

Can you remove "jdk22" from title? It is confusing since the build fail with latest JDK too.

[shipilev]

Agreed with Vladimir's comment. Otherwise looks good.

[dholmes-ora]

Thanks for the reviews. Title updated.

/integrate

[openjdk]

@dholmes-ora This pull request has not yet been marked as ready for integration.

[dholmes-ora]

/integrate

[openjdk]

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

• be1d374: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
• ed81a47: 8327964: Simplify BigInteger.implMultiplyToLen intrinsic
• 08face8: 8332890: Module imports don't work inside the same module
• 793fd72: 8332956: Problem list CodeCacheFullCountTest.java until JDK-8332954 is fixed
• 891d5ae: 8332683: G1: G1CardSetArray::EntryDataType [2] triggers ubsan runtime errors
• f3d6fbf: 8330847: G1 accesses uninitialized memory when predicting eden copy time
• 1b8dea4: 8332894: ubsan: vmError.cpp:2090:26: runtime error: division by zero
• 0e7ea39: 8332678: Serial: Remove use of should_clear_all_soft_refs in serial folder
• 72fbfe1: 8330577: G1 sometimes sends jdk.G1HeapRegionTypeChange for non-changes
• 0889155: 8332885: Clarify failure_handler self-tests
• ... and 170 more: https://git.openjdk.org/jdk/compare/5053b70a7fc67ce9b73dbeecbdd88fbc34d45e04...master

Your commit was automatically rebased without conflicts.

[openjdk]

@dholmes-ora Pushed as commit 86eb5d9.

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

[dholmes-ora]

/backport jdk22u

[openjdk]

@dholmes-ora the backport was successfully created on the branch backport-dholmes-ora-86eb5d9f in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 86eb5d9f from the openjdk/jdk repository.

The commit being backported was authored by David Holmes on 27 May 2024 and was reviewed by Vladimir Kozlov and Aleksey Shipilev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-dholmes-ora-86eb5d9f:backport-dholmes-ora-86eb5d9f
$ git checkout backport-dholmes-ora-86eb5d9f
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-dholmes-ora-86eb5d9f

⚠️ @dholmes-ora You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.