8137329: [windows] Build broken on VS2010 after "8046148: JEP 158: Unified JVM Logging"

[ktakakuri]

trafficstars

Hi all, This is a backport of JDK-8137329: [windows] Build broken on VS2010 after "8046148: JEP 158: Unified JVM Logging". I worked on backporting JDK-8159695 to jdk8u ( https://github.com/openjdk/jdk8u-dev/pull/428 ), and found that VS2010 build fails. This is because strtoull function, which the JDK-8159695 patch contains, is not predefined in VS2010. This patch defines strtoull macro when the earlier versions of Visual Studio are used, so this patch need to be backported for builing with VS2010 if JDK-8159695 is backported as proposed.

This patch couldn't be applied cleanly due to a previously backported fix for earlier versions of Visual Studio at the same location, which needs to be merged.

The risk is low as this only affects earlier VS builds and introduces one macro.
Testing: GHA

Thank you.

---

Progress

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

Integration blocker

 ⚠️ Dependency #428 must be integrated first

Issue

• JDK-8137329: [windows] Build broken on VS2010 after "8046148: JEP 158: Unified JVM Logging" (Bug - P4 - Requested)

Reviewers

• Thomas Stuefe (@tstuefe - Reviewer) ⚠️ Review applies to 7b175458

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 434

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper[bot]]

:wave: Welcome back ktakakuri! A progress list of the required criteria for merging this PR into pr/428 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]]

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

[mlbridge[bot]]

Webrevs

• 02: Full - Incremental (ba63f361)
• 01: Full - Incremental (5fbb88b2)
• 00: Full (7b175458)

[tstuefe]

Please look at the test errors in GHAs and check them. Provided they have nothing to do with the patch, my approval still stands.

[bridgekeeper[bot]]

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[openjdk[bot]]

@ktakakuri This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8137329: [windows] Build broken on VS2010 after  "8046148: JEP 158: Unified JVM Logging"

Reviewed-by: stuefe, andrew

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

• b499ea7ec2ffb2211a67d38b3bd689a77866cb0d: 8030204: com/sun/jdi/JdbExprTest.sh: Required output "Can\'t convert 2147483648 to int" not found
• b1e2ea81f45d9b144e1de8d16b2b698f1788d4d7: 8279164: Disable TLS_ECDH_* cipher suites
• 6abb3f27b9a535f741c7d3a8dfa0d6b811263a9e: 8035395: sun/management/jmxremote/startstop/JMXStartStopTest.java fails intermittently: Port already in use
• 683860572c87e9c89ba7de45264c1d32b195db8c: 8311666: Disabled tests in test/jdk/sun/java2d/marlin
• bfb1a7d1e34ed2e0e88e67a5f77410de097fc489: 4660158: TTY: NumberFormatException while trying to set values by 'set' command
• 0357abbfe41fc3dc244c30e48f8f9193219ea406: 8324632: Update Zlib Data Compression Library to Version 1.3.1
• 61dde50292198f9f35f906eef00b1fd002a19074: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
• 8892b817af1b25520b05608a30ea539dd0c0b25f: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
• 9da7380962e4532c880235c1dc74c9333a1b52f1: 8331730: [8u] GHA: update sysroot for cross builds to Debian bullseye
• 9a7aa794506ded4771d8a29356c20f7c0c6e8327: 8333669: [8u] GHA: Dead VS2010 download link
• ... and 23 more: https://git.openjdk.org/jdk8u-dev/compare/1db6a7606c297fd87d5f143cac40e7652b94404c...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@tstuefe, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk[bot]]

⚠️ @ktakakuri 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).

[ktakakuri]

Some tests are failing in GHA, but they are irrelevant as they are related to certification or GC.

[ktakakuri]

/approval request Fix Request 8u
Backporting JDK-8159695 requires this patch. The patch applies with trivial conflict resolution. Low risk, defining macro. Tesing: GHA, and hotspot_tier1.

[openjdk[bot]]

@ktakakuri 8137329: The approval request has been created successfully.

[bridgekeeper[bot]]

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[bridgekeeper[bot]]

@ktakakuri This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

[ktakakuri]

/open

[openjdk[bot]]

@ktakakuri The target branch of this pull request no longer exists. Please retarget this pull request. Please issue this command again once the problem has been resolved.

[ktakakuri]

/open

[openjdk[bot]]

@ktakakuri This pull request is now open

[gnu-andrew]

Given #428 breaks the build because this function is not present on VS2010, I think this change should go in before #428, not after.

@ktakakuri can you update this PR to apply against latest master, so we can get it in? Thanks.

[ktakakuri]

I changed the branch to merge into to master.

[ktakakuri]

I reverted JDK-8159695 fix.

[gnu-andrew]

/approve yes

[openjdk[bot]]

@gnu-andrew 8137329: The approval request has been approved.

[ktakakuri]

/integrate

[openjdk[bot]]

@ktakakuri Your change (at version ba63f361b263bf4f8930bee456d7ad322ece7537) is now ready to be sponsored by a Committer.

[phohensee]

/sponsor

[openjdk[bot]]

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

• a0715ab4bc71642203324a2c06774aacee35fda7: 8238274: (sctp) JDK-7118373 is not fixed for SctpChannel
• b499ea7ec2ffb2211a67d38b3bd689a77866cb0d: 8030204: com/sun/jdi/JdbExprTest.sh: Required output "Can\'t convert 2147483648 to int" not found
• b1e2ea81f45d9b144e1de8d16b2b698f1788d4d7: 8279164: Disable TLS_ECDH_* cipher suites
• 6abb3f27b9a535f741c7d3a8dfa0d6b811263a9e: 8035395: sun/management/jmxremote/startstop/JMXStartStopTest.java fails intermittently: Port already in use
• 683860572c87e9c89ba7de45264c1d32b195db8c: 8311666: Disabled tests in test/jdk/sun/java2d/marlin
• bfb1a7d1e34ed2e0e88e67a5f77410de097fc489: 4660158: TTY: NumberFormatException while trying to set values by 'set' command
• 0357abbfe41fc3dc244c30e48f8f9193219ea406: 8324632: Update Zlib Data Compression Library to Version 1.3.1
• 61dde50292198f9f35f906eef00b1fd002a19074: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
• 8892b817af1b25520b05608a30ea539dd0c0b25f: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
• 9da7380962e4532c880235c1dc74c9333a1b52f1: 8331730: [8u] GHA: update sysroot for cross builds to Debian bullseye
• ... and 24 more: https://git.openjdk.org/jdk8u-dev/compare/1db6a7606c297fd87d5f143cac40e7652b94404c...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@phohensee @ktakakuri Pushed as commit 44eac48705dd89f20cda5c4384cbecf417555eb1.

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