JDK-8348597 : Update HarfBuzz to 10.4.0 #23910

honkar-jdk · 2025-03-04T23:52:49Z

Harfbuzz upgraded to v10.4.0

File changes -

Newly added files

libharfbuzz/OT/Var/VARC/VARC.hh
libharfbuzz/OT/Var/VARC/coord-setter.hh
libharfbuzz/hb-decycler.hh
libharfbuzz/hb-geometry.hh 
libharfbuzz/hb-ot-var-varc-table.hh 
libharfbuzz/hb-subset-instancer-iup.hh  
libharfbuzz/hb-subset-serialize.h

Deleted

libharfbuzz/OT/glyf/VarCompositeGlyph.hh
libharfbuzz/OT/glyf/coord-setter.hh

Modified: 182 existing files modified

To prevent build failures due to dangling pointer (on linux) it has been added to HARFBUZZ_DISABLED_WARNINGS_gcc in ClientLibraries.gmk

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

JDK-8348597: Update HarfBuzz to 10.4.0 (Bug - P3)

Reviewers

Erik Joelsson (@erikj79 - Reviewer)
Phil Race (@prrace - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23910

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-03-04T23:53:37Z

👋 Welcome back honkar! 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 · 2025-03-04T23:54:29Z

@honkar-jdk 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:

8348597: Update HarfBuzz to 10.4.0

Reviewed-by: erikj, prr

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

11a37c8: 8351165: Remove unused includes from vmStructs
c3b4819: 8351074: Disallow null prefix and suffix in DecimalFormat
6012e8d: 8350808: Small typos in JShell method SnippetEvent.toString()
661bd5b: 8343478: Remove unnecessary @SuppressWarnings annotations (core-libs)
61d9ab9: 8350854: Include thread counts in safepoint logging
ea9e3cf: 8281511: java/net/ipv6tests/UdpTest.java fails with checkTime failed
caaf409: 8350546: Several java/net/InetAddress tests fails UnknownHostException
062b7c7: 8351115: Test AOTClassLinkingVMOptions.java fails after JDK-8348322
a88e8cd: 8350952: Remove some non present files from OPT_SPEED_SRC list
de29ef3: 8343191: Cgroup v1 subsystem fails to set subsystem path
... and 68 more: https://git.openjdk.org/jdk/compare/f1398ecbe4a650d8d8c21fabb1b8e2e9600fdfec...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 · 2025-03-04T23:55:02Z

@honkar-jdk The following labels will be automatically applied to this pull request:

build
client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2025-03-05T01:03:49Z

Webrevs

00: Full (20db9b56)

erikj79

Build change looks ok.

The clang users on Linux may want to check if the same new warning triggers there.

/reviewers 2

openjdk · 2025-03-05T14:10:10Z

@erikj79
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

honkar-jdk · 2025-03-05T19:00:49Z

src/java.desktop/share/native/libharfbuzz/hb.hh

@@ -129,6 +131,7 @@
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #pragma GCC diagnostic ignored "-Wcast-function-type-strict" // https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126
 #pragma GCC diagnostic ignored "-Wdangling-reference" // https://github.com/harfbuzz/harfbuzz/issues/4043
+#pragma GCC diagnostic ignored "-Wdangling-pointer" // Trigerred by hb_decycler_node_t().


@prrace With the latest harfbuzz (v10.4.0), dangling-pointer warning is ignored. With this addition, I assumed that we no longer need to add it to harfbuzz warning section explicitly.

But without adding dangling-pointer to HARFBUZZ_DISABLED_WARNINGS_gcc build fails on linux so probably JDK build requires warnings to be explicitly added to ClientLibraries.gmk ?

decycler.hh:110:25: error: storing the address of local variable ‘decycler_node' in '((hb_decycler_t*)((char*)scratch + 8))[1].hb_decycler_t::tortoise' [-Werror=dangling-pointer=] 110 | decycler.tortoise = decycler.hare = this; | ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~

Interesting. I also would have expected this to over-ride the JDK default.
But if that's what you see ...
A bit of googling suggests that sometimes these pragmas are read too late.

prrace · 2025-03-05T05:50:32Z

src/java.desktop/share/native/libharfbuzz/UPDATING.txt

@@ -53,9 +53,9 @@ STEP 2: BUILD CHANGES INCREMENTALLY

 STEP 3: COMPILER WARNINGS AND SETTING FLAGS
 -------------------------------------------
- Update make parameters in Awt2DLibraries.gmk
+- Update make parameters in make/modules/java.desktop/lib/ClientLibraries.gmk


prrace · 2025-03-05T20:15:19Z

src/java.desktop/share/native/libharfbuzz/hb.hh

@@ -129,6 +131,7 @@
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #pragma GCC diagnostic ignored "-Wcast-function-type-strict" // https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126
 #pragma GCC diagnostic ignored "-Wdangling-reference" // https://github.com/harfbuzz/harfbuzz/issues/4043
+#pragma GCC diagnostic ignored "-Wdangling-pointer" // Trigerred by hb_decycler_node_t().


Interesting. I also would have expected this to over-ride the JDK default.
But if that's what you see ...
A bit of googling suggests that sometimes these pragmas are read too late.

prrace

I had to use webrev to review. github was too painfully slow.

honkar-jdk added 8 commits March 3, 2025 17:01

deleted files

75b176f

newly added files

bcca07d

modified files

0a2ed2b

.md file changes

fe27d52

warning section updated in gmk

db582e6

whitespace fix

5f9fdea

v10.3.0 to v10.4.0 changes

79209ad

md file updated to 10.4.0

68d96f9

openjdk bot added build [email protected] client [email protected] labels Mar 4, 2025

honkar-jdk added 2 commits March 4, 2025 16:24

md file updated

c756814

md file updated

20db9b5

honkar-jdk marked this pull request as ready for review March 5, 2025 00:59

openjdk bot added the rfr Pull request is ready for review label Mar 5, 2025

erikj79 approved these changes Mar 5, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 5, 2025

openjdk bot removed the ready Pull request is ready to be integrated label Mar 5, 2025

honkar-jdk commented Mar 5, 2025

View reviewed changes

prrace reviewed Mar 5, 2025

View reviewed changes

prrace approved these changes Mar 5, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 5, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8348597 : Update HarfBuzz to 10.4.0 #23910

JDK-8348597 : Update HarfBuzz to 10.4.0 #23910

honkar-jdk commented Mar 4, 2025 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 4, 2025

openjdk bot commented Mar 4, 2025 •

edited

Loading

openjdk bot commented Mar 4, 2025

mlbridge bot commented Mar 5, 2025

erikj79 left a comment

openjdk bot commented Mar 5, 2025

honkar-jdk Mar 5, 2025 •

edited

Loading

prrace Mar 5, 2025

prrace Mar 5, 2025

prrace Mar 5, 2025

prrace left a comment

JDK-8348597 : Update HarfBuzz to 10.4.0 #23910

Are you sure you want to change the base?

JDK-8348597 : Update HarfBuzz to 10.4.0 #23910

Conversation

honkar-jdk commented Mar 4, 2025 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Mar 4, 2025

openjdk bot commented Mar 4, 2025 • edited Loading

openjdk bot commented Mar 4, 2025

mlbridge bot commented Mar 5, 2025

Webrevs

erikj79 left a comment

Choose a reason for hiding this comment

openjdk bot commented Mar 5, 2025

honkar-jdk Mar 5, 2025 • edited Loading

Choose a reason for hiding this comment

prrace Mar 5, 2025

Choose a reason for hiding this comment

prrace Mar 5, 2025

Choose a reason for hiding this comment

prrace Mar 5, 2025

Choose a reason for hiding this comment

prrace left a comment

Choose a reason for hiding this comment

honkar-jdk commented Mar 4, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Mar 4, 2025 •

edited

Loading

honkar-jdk Mar 5, 2025 •

edited

Loading