[prev in list] [next in list] [prev in thread] [next in thread]
List: openjdk-2d-dev
Subject: [OpenJDK 2D-Dev] [11u] RFR 8210782: Upgrade HarfBuzz to the latest 2.3.1
From: "Langer, Christoph" <christoph.langer () sap ! com>
Date: 2019-04-30 9:26:25
Message-ID: AM6PR02MB5192362C7706770854881DA08A3A0 () AM6PR02MB5192 ! eurprd02 ! prod ! outlook ! com
[Download RAW message or body]
Hi,
please help reviewing the backport of JDK-8210782: Upgrade HarfBuzz to the latest \
2.3.1.
This has been backported to 11.0.4-oracle already. I took the large change down to \
11u-dev. It applies quite nicely, apart from a little issue in \
make/lib/Awt2dLibraries.gmk:
--- Awt2dLibraries.gmk
+++ Awt2dLibraries.gmk
@@ -613,8 +614,7 @@
type-limits missing-field-initializers implicit-fallthrough \
strict-aliasing undef unused-function, \
DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
- maybe-uninitialized \
- missing-attributes class-memaccess, \
+ maybe-uninitialized class-memaccess, \
DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
tautological-constant-out-of-range-compare int-to-pointer-cast \
sign-compare undef missing-field-initializers, \
The original change would remove the disabling of the "missing-attributes" warnings, \
but since this warning type is not disabled in jdk11u-dev currently, I would just \
skip that diff.
With that change, most platforms did build fine, except for Solaris (where we use \
Oracle Studio 12u4 in jdk11u-dev vs Oracle Studio 12u6 in jdk/jdk) and AIX (xlc12 vs. \
xlc16).
To keep support for Oracle Studio 12u4 for Solaris, I had to remove the warning flag \
"refmemnoconstr_aggr" from line 622 (as opposed to the original change). Seems that \
it is not yet supported in OS12u4.
Furthermore, a code tweak had to be done (Thanks, Matthias, for your help here):
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh \
Fri Mar 01 16:59:19 2019 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh \
Mon Apr 29 16:26:41 2019 +0200 @@ -280,6 +280,10 @@
{
str_buff_t &flatStr;
bool drop_hints;
+
+ // Solaris: OS12u4 complains about "A class with a reference member lacks a \
user-defined constructor" + // so provide the constructor
+ flatten_param_t(str_buff_t& sbt, bool dh) : flatStr(sbt), drop_hints(dh) {}
};
template <typename ACC, typename ENV, typename OPSET>
@@ -305,7 +309,9 @@
return false;
cs_interpreter_t<ENV, OPSET, flatten_param_t> interp;
interp.env.init (str, acc, fd);
- flatten_param_t param = { flat_charstrings[i], drop_hints };
+ // Solaris: OS12u4 does not like the C++11 style init
+ // flatten_param_t param = { flat_charstrings[i], drop_hints };
+ flatten_param_t param(flat_charstrings[i], drop_hints);
if (unlikely (!interp.interpret (param)))
return false;
}
For AIX, this tweak had to be added (credit goes to Matthias as well):
diff -r 2b3dbedfbfb9 src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh Fri Mar 01 \
16:59:19 2019 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh Mon Apr 29 \
16:26:41 2019 +0200 @@ -83,7 +83,9 @@
template <typename T, typename V, typename B>
struct _hb_assign
-{ static inline void value (T &o, const V v) { o = v; } };
+// add cast to please AIX xlc12.1
+//{ static inline void value (T &o, const V v) { o = v; } };
+{ static inline void value (T &o, const V v) { o = (T&) v; } };
template <typename T, typename V>
struct _hb_assign<T, V, _hb_bool_type<(bool) (1 + (unsigned int) T::min_size)> >
{ static inline void value (T &o, const V v) { o.set (v); } };
Bug: https://bugs.openjdk.java.net/browse/JDK-8210782
Original Change: http://hg.openjdk.java.net/jdk/jdk/rev/7c11a7cc7c1d
Review discussion for jdk/jdk: \
https://mail.openjdk.java.net/pipermail/2d-dev/2019-March/009914.html New Webrev: \
http://cr.openjdk.java.net/~clanger/webrevs/8210782.jdk11u/
Thanks & Best regards
Christoph
[Attachment #3 (text/html)]
<html xmlns:v="urn:schemas-microsoft-com:vml" \
xmlns:o="urn:schemas-microsoft-com:office:office" \
xmlns:w="urn:schemas-microsoft-com:office:word" \
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" \
xmlns="http://www.w3.org/TR/REC-html40"> <head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="DE" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<p class="MsoNormal">Hi,<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span lang="EN-US">please help reviewing the backport of \
JDK-8210782: Upgrade HarfBuzz to the latest 2.3.1.<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">This has been backported to 11.0.4-oracle \
already. I took the large change down to 11u-dev. It applies quite nicely, apart from \
a little issue in make/lib/Awt2dLibraries.gmk:<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">--- Awt2dLibraries.gmk<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">+++ \
Awt2dLibraries.gmk<o:p></o:p></span></p> <p class="MsoNormal"><span lang="EN-US">@@ \
-613,8 +614,7 @@<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> type-limits \
missing-field-initializers implicit-fallthrough \<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"> \
strict-aliasing undef unused-function, \<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"> \
DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
\<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">- maybe-uninitialized \
\<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">- missing-attributes \
class-memaccess, \<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+ maybe-uninitialized \
class-memaccess, \<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> DISABLED_WARNINGS_clang := unused-value \
incompatible-pointer-types \<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> \
tautological-constant-out-of-range-compare int-to-pointer-cast \
\<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> sign-compare undef \
missing-field-initializers, \<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span lang="EN-US">The \
original change would remove the disabling of the “missing-attributes” \
warnings, but since this warning type is not disabled in jdk11u-dev currently, I \
would just skip that diff.<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">With that change, most platforms did build fine, except for Solaris \
(where we use Oracle Studio 12u4 in jdk11u-dev vs Oracle Studio 12u6 in jdk/jdk) and \
AIX (xlc12 vs. xlc16).<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span lang="EN-US">To \
keep support for Oracle Studio 12u4 for Solaris, I had to remove the warning flag \
“refmemnoconstr_aggr” from line 622 (as opposed to the original change). \
Seems that it is not yet supported in OS12u4.<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">Furthermore, a code tweak had to be done \
(Thanks, Matthias, for your help here):<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">--- \
a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh \
Fri Mar 01 16:59:19 2019 -0800<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+++ \
b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh \
Mon Apr 29 16:26:41 2019 +0200<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">@@ -280,6 +280,10 @@<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">{<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"> str_buff_t \
&flatStr;<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> bool drop_hints;<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">+<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">+ // Solaris: OS12u4 complains about \
"A class with a reference member lacks a user-defined \
constructor"<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+ // so provide the constructor<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">+ flatten_param_t(str_buff_t& sbt, \
bool dh) : flatStr(sbt), drop_hints(dh) {}<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">};<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">template <typename ACC, typename ENV, \
typename OPSET><o:p></o:p></span></p> <p class="MsoNormal"><span lang="EN-US">@@ \
-305,7 +309,9 @@<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> return \
false;<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> cs_interpreter_t<ENV, OPSET, \
flatten_param_t> interp;<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> interp.env.init (str, acc, \
fd);<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">- flatten_param_t param = { \
flat_charstrings[i], drop_hints };<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+ // Solaris: OS12u4 does not like the \
C++11 style init<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+ // flatten_param_t param = { \
flat_charstrings[i], drop_hints };<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+ flatten_param_t \
param(flat_charstrings[i], drop_hints);<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"> if \
(unlikely (!interp.interpret (param)))<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"> \
return false;<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> }<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">For AIX, this tweak had to be added (credit goes \
to Matthias as well):<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">diff -r 2b3dbedfbfb9 \
src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">--- \
a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh Fri Mar 01 \
16:59:19 2019 -0800<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">+++ \
b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh Mon Apr 29 \
16:26:41 2019 +0200<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">@@ -83,7 +83,9 @@<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">template <typename T, typename V, typename \
B><o:p></o:p></span></p> <p class="MsoNormal"><span lang="EN-US">struct \
_hb_assign<o:p></o:p></span></p> <p class="MsoNormal"><span lang="EN-US">-{ static \
inline void value (T &o, const V v) { o = v; } };<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">+// add cast to please AIX \
xlc12.1<o:p></o:p></span></p> <p class="MsoNormal"><span lang="EN-US">+//{ static \
inline void value (T &o, const V v) { o = v; } };<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">+{ static inline void value (T &o, const \
V v) { o = (T&) v; } };<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">template <typename T, typename V><o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">struct _hb_assign<T, V, \
_hb_bool_type<(bool) (1 + (unsigned int) T::min_size)> \
><o:p></o:p></span></p> <p class="MsoNormal"><span lang="EN-US">{ static inline \
void value (T &o, const V v) { o.set (v); } };<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">Bug: <a \
href="https://bugs.openjdk.java.net/browse/JDK-8210782"> \
https://bugs.openjdk.java.net/browse/JDK-8210782</a><o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">Original Change: <a \
href="http://hg.openjdk.java.net/jdk/jdk/rev/7c11a7cc7c1d"> \
http://hg.openjdk.java.net/jdk/jdk/rev/7c11a7cc7c1d</a><o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">Review discussion for jdk/jdk: <a \
href="https://mail.openjdk.java.net/pipermail/2d-dev/2019-March/009914.html"> \
https://mail.openjdk.java.net/pipermail/2d-dev/2019-March/009914.html</a><o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">New Webrev: <a \
href="http://cr.openjdk.java.net/~clanger/webrevs/8210782.jdk11u/"> \
http://cr.openjdk.java.net/~clanger/webrevs/8210782.jdk11u/</a><o:p></o:p></span></p> \
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">Thanks & Best regards<o:p></o:p></span></p> \
<p class="MsoNormal"><span lang="EN-US">Christoph<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> </div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic