Skip to content

8261169: Upgrade HarfBuzz to the latest 2.8.0 #3826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
prrace wants to merge 1 commit into from
Closed

8261169: Upgrade HarfBuzz to the latest 2.8.0 #3826

prrace wants to merge 1 commit into from

Conversation

@prrace
Copy link
Contributor

@prrace prrace commented Apr 30, 2021 •
edited by openjdk bot
Loading

Upgrade to harfbuzz 2.8

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3826/head:pull/3826
$ git checkout pull/3826

Update a local copy of the PR:
$ git checkout pull/3826
$ git pull https://git.openjdk.java.net/jdk pull/3826/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3826

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3826.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 30, 2021

👋 Welcome back prr! 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 openjdk bot added the rfr Pull request is ready for review label Apr 30, 2021
@openjdk
Copy link

openjdk bot commented Apr 30, 2021

@prrace The following labels will be automatically applied to this pull request:

  • 2d
  • build

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.

@openjdk openjdk bot added 2d client-libs-dev@openjdk.org build build-dev@openjdk.org labels Apr 30, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 30, 2021

Webrevs

mrserb
mrserb approved these changes May 1, 2021
View reviewed changes
Copy link
Member

@mrserb mrserb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume the build using bundled lib is fine on all our platforms.

@openjdk
Copy link

openjdk bot commented May 1, 2021 •
edited
Loading

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

8261169: Upgrade HarfBuzz to the latest 2.8.0

Reviewed-by: serb

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

  • f86b70c: 8266328: C2: Remove InlineWarmCalls
  • 928d632: 8252237: C2: Call to compute_separating_interferences has wrong argument order
  • 50fa162: 8266389: ProblemList java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on generic-all
  • dd05158: 8266155: Convert java.base to use Stream.toList()
  • c36c63a: 8260560: convert jdeps and jdeprscan tools to use Stream.toList()
  • 096e9e5: 8266318: Switch to macos prefix for macOS bundles
  • 0544a73: 8255227: java/net/httpclient/FlowAdapterPublisherTest.java intermittently failing with TestServer: start exception: java.io.IOException: Invalid preface
  • 48bb996: 8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
  • 87de5b7: 8266040: Lanai: Incorrect calculations of clipping boundaries
  • eb8db12: 8263396: Atomic::CmpxchgByteUsingInt::set_byte_in_int needs an explicit cast
  • ... and 12 more: https://git.openjdk.java.net/jdk/compare/51b2fb5c848171046d5c2fb822f09d6535a23c4c...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 openjdk bot added the ready Pull request is ready to be integrated label May 1, 2021
@prrace
Copy link
Contributor Author

prrace commented May 3, 2021

I assume the build using bundled lib is fine on all our platforms.

Yes.

@prrace
Copy link
Contributor Author

prrace commented May 4, 2021

/integrate

@openjdk openjdk bot closed this May 4, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 4, 2021
@openjdk
Copy link

openjdk bot commented May 4, 2021

@prrace Since your change was applied there have been 54 commits pushed to the master branch:

  • 9c4efdd: 8263124: Missed initialization of baselineY in sun.font.StrikeMetrics
  • 4e96b31: 8265989: System property for the native character encoding name
  • 8b37d48: 8255493: Support for pre-generated java.lang.invoke classes in CDS dynamic archive
  • 770dfc1: 8265279: Remove unused RandomGeneratorFactory.all(Class category)
  • ee5bba0: 8265767: compiler/eliminateAutobox/TestIntBoxing.java crashes on arm32 after 8264649 in debug VMs
  • 05e6017: 8265137: java.util.Random suddenly has new public methods nowhere documented
  • aa90df6: 8266187: Memory leak in appendBootClassPath()
  • b651904: 8266438: Compile::remove_useless_nodes does not remove opaque nodes
  • 141cc2f: 8261527: Record page size used for underlying mapping in ReservedSpace
  • 8e071c4: 8265784: [C2] Hoisting of DecodeN leaves MachTemp inputs behind
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/51b2fb5c848171046d5c2fb822f09d6535a23c4c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 80323b7.

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

@DamonFool
Copy link
Member

DamonFool commented May 4, 2021

Hi @prrace ,

Our CI/CD got the following build errors on x86_64 with gcc 8.3.1:

Building target 'images' in configuration 'linux-x86_64-server-fastdebug'
Updating support/modules_libs/java.base/server/libjvm.so due to 1 file(s)
In file included from /home/jvm/jdk/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc:33:
hb-ot-shape-complex-use-machine.rl: In instantiation of 'machine_index_t<Iter>::machine_index_t(const machine_index_t<Iter>&) [with Iter = hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> >]':
hb-ot-shape-complex-use-machine.rl:249:11:   required from here
hb-ot-shape-complex-use-machine.rl:194:9: error: base class 'struct hb_iter_with_fallback_t<machine_index_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> > >, hb_pair_t<unsigned int, hb_pair_t<unsigned int, hb_glyph_info_t&> > >' should be explicitly initialized in the copy constructor [-Werror=extra]
cc1plus: all warnings being treated as errors
gmake[3]: *** [/home/jvm/jdk/build/linux-x86_64-server-fastdebug/support/native/java.desktop/libfontmanager/hb-ot-shape-complex-use.o] Error 1
gmake[2]: *** [java.desktop-libs] Error 1

ERROR: Build failed for target 'images' in configuration 'linux-x86_64-server-fastdebug' (exit code 2) 

=== Output from failing command(s) repeated here ===
* For target support_native_java.desktop_libfontmanager_hb-ot-shape-complex-use.o:
In file included from /home/jvm/jdk/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc:33:
hb-ot-shape-complex-use-machine.rl: In instantiation of 'machine_index_t<Iter>::machine_index_t(const machine_index_t<Iter>&) [with Iter = hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> >]':
hb-ot-shape-complex-use-machine.rl:249:11:   required from here
hb-ot-shape-complex-use-machine.rl:194:9: error: base class 'struct hb_iter_with_fallback_t<machine_index_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> > >, hb_pair_t<unsigned int, hb_pair_t<unsigned int, hb_glyph_info_t&> > >' should be explicitly initialized in the copy constructor [-Werror=extra]
cc1plus: all warnings being treated as errors

* All command lines available in /home/jvm/jdk/build/linux-x86_64-server-fastdebug/make-support/failure-logs.

Could you please have a look?
I'm on a vacation this week.

Thanks.

@tstuefe
Copy link
Member

tstuefe commented May 5, 2021

Same here. In my case it breaks with gcc 7.5.0, which I believe is still supported.

I opened https://bugs.openjdk.java.net/browse/JDK-8266545.

@tstuefe
Copy link
Member

tstuefe commented May 5, 2021

#3873

@mlbridge
Copy link

mlbridge bot commented May 14, 2021

Mailing list message from Florian Weimer on 2d-dev:

* Phil Race:

Upgrade to harfbuzz 2.8

I believe this causes a build failure with GCC 8.3 (from Debian
buster):

* For target support_native_java.desktop_libfontmanager_hb-ot-shape-complex-use.o:
In file included from ?/jdk/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc:33:
hb-ot-shape-complex-use-machine.rl: In instantiation of 'machine_index_t<Iter>::machine_index_t(const machine_index_t<Iter>&) [with Iter = hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> >]':
hb-ot-shape-complex-use-machine.rl:249:11: required from here
hb-ot-shape-complex-use-machine.rl:194:9: error: base class 'struct hb_iter_with_fallback_t<machine_index_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> > >, hb_pair_t<unsigned int, hb_pair_t<unsigned int, hb_glyph_info_t&> > >' should be explicitly initialized in the copy constructor [-Werror=extra]
cc1plus: all warnings being treated as errors

1 similar comment
@mlbridge
Copy link

mlbridge bot commented May 14, 2021

Mailing list message from Florian Weimer on 2d-dev:

* Phil Race:

Upgrade to harfbuzz 2.8

I believe this causes a build failure with GCC 8.3 (from Debian
buster):

* For target support_native_java.desktop_libfontmanager_hb-ot-shape-complex-use.o:
In file included from ?/jdk/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc:33:
hb-ot-shape-complex-use-machine.rl: In instantiation of 'machine_index_t<Iter>::machine_index_t(const machine_index_t<Iter>&) [with Iter = hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> >]':
hb-ot-shape-complex-use-machine.rl:249:11: required from here
hb-ot-shape-complex-use-machine.rl:194:9: error: base class 'struct hb_iter_with_fallback_t<machine_index_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> > >, hb_pair_t<unsigned int, hb_pair_t<unsigned int, hb_glyph_info_t&> > >' should be explicitly initialized in the copy constructor [-Werror=extra]
cc1plus: all warnings being treated as errors

@mlbridge
Copy link

mlbridge bot commented May 14, 2021

Mailing list message from Philip Race on 2d-dev:

I built with gcc 10.3 https://bugs.openjdk.java.net/browse/JDK-8265373

I expect we can accommodate disabling one more warning to support more
compilers.

-phil.

On 5/4/21 12:31 PM, Florian Weimer wrote:

* Phil Race:

Upgrade to harfbuzz 2.8
I believe this causes a build failure with GCC 8.3 (from Debian
buster):

* For target support_native_java.desktop_libfontmanager_hb-ot-shape-complex-use.o:
In file included from ?/jdk/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc:33:
hb-ot-shape-complex-use-machine.rl: In instantiation of 'machine_index_t<Iter>::machine_index_t(const machine_index_t<Iter>&) [with Iter = hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> >]':
hb-ot-shape-complex-use-machine.rl:249:11: required from here
hb-ot-shape-complex-use-machine.rl:194:9: error: base class 'struct hb_iter_with_fallback_t<machine_index_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> > >, hb_pair_t<unsigned int, hb_pair_t<unsigned int, hb_glyph_info_t&> > >' should be explicitly initialized in the copy constructor [-Werror=extra]
cc1plus: all warnings being treated as errors

1 similar comment
@mlbridge
Copy link

mlbridge bot commented May 14, 2021

Mailing list message from Philip Race on 2d-dev:

I built with gcc 10.3 https://bugs.openjdk.java.net/browse/JDK-8265373

I expect we can accommodate disabling one more warning to support more
compilers.

-phil.

On 5/4/21 12:31 PM, Florian Weimer wrote:

* Phil Race:

Upgrade to harfbuzz 2.8
I believe this causes a build failure with GCC 8.3 (from Debian
buster):

* For target support_native_java.desktop_libfontmanager_hb-ot-shape-complex-use.o:
In file included from ?/jdk/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc:33:
hb-ot-shape-complex-use-machine.rl: In instantiation of 'machine_index_t<Iter>::machine_index_t(const machine_index_t<Iter>&) [with Iter = hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> >]':
hb-ot-shape-complex-use-machine.rl:249:11: required from here
hb-ot-shape-complex-use-machine.rl:194:9: error: base class 'struct hb_iter_with_fallback_t<machine_index_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_filter_iter_t<hb_filter_iter_t<hb_zip_iter_t<hb_iota_iter_t<unsigned int, unsigned int>, hb_array_t<hb_glyph_info_t> >, find_syllables_use(hb_buffer_t*)::<lambda(const hb_glyph_info_t&)>, const<unnamed struct>&, 0>, find_syllables_use(hb_buffer_t*)::<lambda(hb_pair_t<unsigned int, const hb_glyph_info_t&>)>, const<unnamed struct>&, 0> > >, hb_pair_t<unsigned int, hb_pair_t<unsigned int, hb_glyph_info_t&> > >' should be explicitly initialized in the copy constructor [-Werror=extra]
cc1plus: all warnings being treated as errors

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@mrserb mrserb mrserb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2d client-libs-dev@openjdk.org build build-dev@openjdk.org integrated Pull request has been integrated

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@prrace @DamonFool @tstuefe @mrserb