Skip to content

Commit

Permalink
8312592: New parentheses warnings after HarfBuzz 7.2.0 update
Browse files Browse the repository at this point in the history
Reviewed-by: prr, serb
  • Loading branch information
shipilev committed Jul 25, 2023
1 parent 9999838 commit ea067fc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion make/modules/java.desktop/lib/Awt2dLibraries.gmk
Expand Up @@ -491,7 +491,7 @@ else
LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc

HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers strict-aliasing \
unused-result array-bounds
unused-result array-bounds parentheses
# noexcept-type required for GCC 7 builds. Not required for GCC 8+.
# expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type expansion-to-defined dangling-reference
Expand Down

5 comments on commit ea067fc

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@shipilev
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on ea067fc Oct 18, 2023

Choose a reason for hiding this comment

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

@shipilev the backport was successfully created on the branch shipilev-backport-ea067fc3 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u: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 ea067fc3 from the openjdk/jdk repository.

The commit being backported was authored by Aleksey Shipilev on 25 Jul 2023 and was reviewed by Phil Race and Sergey Bylokhov.

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/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git shipilev-backport-ea067fc3:shipilev-backport-ea067fc3
$ git checkout shipilev-backport-ea067fc3
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git shipilev-backport-ea067fc3

@shipilev
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on ea067fc Oct 18, 2023

Choose a reason for hiding this comment

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

@shipilev Could not automatically backport ea067fc3 to openjdk/jdk17u-dev due to conflicts in the following files:

  • make/modules/java.desktop/lib/Awt2dLibraries.gmk

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b shipilev-backport-ea067fc3

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git ea067fc3d2b1fecda694442c7921ecb980377c1e

# Backport the commit
$ git cherry-pick --no-commit ea067fc3d2b1fecda694442c7921ecb980377c1e
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport ea067fc3d2b1fecda694442c7921ecb980377c1e'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport ea067fc3d2b1fecda694442c7921ecb980377c1e.

Please sign in to comment.