8299635: Hotspot update for deprecated sprintf in Xcode 14 #2663

gdams · 2024-07-04T20:40:44Z

Changes to the patch:

The following files don't exist in jdk17u

test/hotspot/jtreg/runtime/Thread/libAsyncExceptionOnMonitorEnter.cpp (openjdk/jdk@4e20a03 JDK19+)
test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp (openjdk/jdk@9583e36 JDK19+)
test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp (openjdk/jdk@9583e36 JDK19+)

The changes didn't apply to src/hotspot/share/opto/node.cpp as openjdk/jdk@33ed036 is JDK20+

The changes didn't apply to src/hotspot/share/utilities/globalDefinitions.hpp as openjdk/jdk@04f02ac is JDK19+

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
JDK-8299635 needs maintainer approval

Issue

JDK-8299635: Hotspot update for deprecated sprintf in Xcode 14 (Enhancement - P4 - Approved)

Reviewers

Severin Gehwolf (@jerboaa - Reviewer)
Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2663

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2024-07-04T20:41:08Z

👋 Welcome back gdams! A progress list of the required criteria for merging this PR into pr/2662 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-07-04T20:42:04Z

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

8299635: Hotspot update for deprecated sprintf in Xcode 14

Reviewed-by: sgehwolf, 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 6 new commits pushed to the master branch:

8d974ea: 8299378: sprintf is deprecated in Xcode 14
e191f94: 8299397: Remove metaprogramming/isFloatingPoint.hpp
a1ae58e: 8299399: Remove metaprogramming/isArray.hpp
e661861: 8299402: Remove metaprogramming/isVolatile.hpp
8b9d876: 8299398: Remove metaprogramming/isConst.hpp
f87aa30: 8328238: Convert few closed manual applet tests to main

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 · 2024-07-04T20:42:17Z

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

openjdk-notifier · 2024-07-05T07:14:17Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout xcode_hotspot
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

gdams · 2024-07-05T08:28:42Z

test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp

@@ -1,4 +1,5 @@
 /*
+s


this feels like an accidental s added to the comment but it's the same in openjdk/jdk https://github.com/openjdk/jdk/blob/4ec1ae109710aa150e27acf5706475d335c4655c/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp#L1-L5 so needs fixing there

Thanks. Created openjdk/jdk#20051

Good catch and thanks @jerboaa for fixing in trunk. I'll open a backport to 21u.

mlbridge · 2024-07-05T08:32:31Z

Webrevs

00: Full (266fcb58)

gdams · 2024-07-05T08:35:05Z

Adoptium Build CI

jerboaa

Looks OK to me. File differences were as you said. That was helpful info, thanks!

openjdk · 2024-07-05T12:08:59Z

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

gdams · 2024-07-05T12:10:37Z

/approval request This change applies cleanly other than some missing files in JDK17u. All tests pass. This is also crucial to allow us to upgrade the GH actions workflow to move away from the deprecated macos-11 VMs.

openjdk · 2024-07-05T12:11:05Z

@gdams
8299635: The approval request has been created successfully.

gnu-andrew

Backport looks good. The omissions are actually a good example of how more instance of sprintf have been creeping in since JDK 17. The Mac build failures should now keep more from happening.

test/hotspot/jtreg/runtime/Thread/libAsyncExceptionOnMonitorEnter.cpp is from
JDK-8283044 so wouldn't expect that to ever appear in 17
test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp and test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp` are both from the Virtual Threads JEP (JDK-8284161) so definitely wouldn't expect a backport
The node.cpp changes are from a dumping enhancement (JDK-8283775) so again no backport exported
The globalDefinitions.hpp change is from a fairly controversial adjustment to block the use of the "raw" variants over the os:: versions, and definitely shouldn't be backported (JDK-8214976)

TL;DR: I agree with your omissions.

gnu-andrew · 2024-07-05T19:36:07Z

/approve yes

openjdk · 2024-07-05T19:36:53Z

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

gdams · 2024-07-05T20:16:32Z

/integrate

openjdk · 2024-07-05T20:18:19Z

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

7144027: 8318039: GHA: Bump macOS and Xcode versions
8d974ea: 8299378: sprintf is deprecated in Xcode 14
e191f94: 8299397: Remove metaprogramming/isFloatingPoint.hpp
a1ae58e: 8299399: Remove metaprogramming/isArray.hpp
e661861: 8299402: Remove metaprogramming/isVolatile.hpp
8b9d876: 8299398: Remove metaprogramming/isConst.hpp
f87aa30: 8328238: Convert few closed manual applet tests to main

Your commit was automatically rebased without conflicts.

openjdk · 2024-07-05T20:18:30Z

@gdams Pushed as commit faf55dd.

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

gdams added 2 commits July 4, 2024 14:42

Backport 478ef389dc3767edfbe21d10a7f7f1522c648c2e

a1a5695

Backport e80b5ea448c715519d14e238321ceb5ec40b37f4

c0f72f5

openjdk bot changed the title ~~Backport e80b5ea448c715519d14e238321ceb5ec40b37f4~~ 8299635: Hotspot update for deprecated sprintf in Xcode 14 Jul 4, 2024

openjdk bot added the backport label Jul 4, 2024

openjdk-notifier bot changed the base branch from pr/2662 to master July 5, 2024 07:14

Merge remote-tracking branch 'upstream/master' into xcode_hotspot

266fcb5

gdams commented Jul 5, 2024

View reviewed changes

gdams marked this pull request as ready for review July 5, 2024 08:29

openjdk bot added the rfr Pull request is ready for review label Jul 5, 2024

openjdk bot mentioned this pull request Jul 5, 2024

8318039: GHA: Bump macOS and Xcode versions #2206

Closed

3 tasks

jerboaa approved these changes Jul 5, 2024

View reviewed changes

openjdk bot added the approval label Jul 5, 2024

gnu-andrew approved these changes Jul 5, 2024

View reviewed changes

openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jul 5, 2024

openjdk bot added the integrated Pull request has been integrated label Jul 5, 2024

openjdk bot closed this Jul 5, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8299635: Hotspot update for deprecated sprintf in Xcode 14 #2663

8299635: Hotspot update for deprecated sprintf in Xcode 14 #2663

gdams commented Jul 4, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jul 4, 2024

openjdk bot commented Jul 4, 2024 •

edited

Loading

openjdk bot commented Jul 4, 2024

openjdk-notifier bot commented Jul 5, 2024

gdams Jul 5, 2024

jerboaa Jul 5, 2024

gnu-andrew Jul 5, 2024

mlbridge bot commented Jul 5, 2024

gdams commented Jul 5, 2024

jerboaa left a comment

openjdk bot commented Jul 5, 2024

gdams commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

gnu-andrew left a comment

gnu-andrew commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

gdams commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

8299635: Hotspot update for deprecated sprintf in Xcode 14 #2663

8299635: Hotspot update for deprecated sprintf in Xcode 14 #2663

Conversation

gdams commented Jul 4, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jul 4, 2024

openjdk bot commented Jul 4, 2024 • edited Loading

openjdk bot commented Jul 4, 2024

openjdk-notifier bot commented Jul 5, 2024

gdams Jul 5, 2024

Choose a reason for hiding this comment

jerboaa Jul 5, 2024

Choose a reason for hiding this comment

gnu-andrew Jul 5, 2024

Choose a reason for hiding this comment

mlbridge bot commented Jul 5, 2024

Webrevs

gdams commented Jul 5, 2024

Adoptium Build CI

jerboaa left a comment

Choose a reason for hiding this comment

openjdk bot commented Jul 5, 2024

gdams commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

gnu-andrew left a comment

Choose a reason for hiding this comment

gnu-andrew commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

gdams commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

openjdk bot commented Jul 5, 2024

gdams commented Jul 4, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Jul 4, 2024 •

edited

Loading