From 437c9ca9674b72ebc873fa8e1bedd3dd65f88d2c Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Wed, 9 Aug 2023 17:14:40 -0400 Subject: [PATCH 1/3] Set a default thread name for java.util.TimerThread Issue https://github.com/eclipse-openj9/openj9/issues/11930 The name isn't set in the TimerThread constructor, it calls Thread.newName() which consumes the "Thread-0" name. This causes the test to fail because it expects this name. This could have an impact on / confuse users which expect consistent thread names. Depending on the timing of the Attach API AttachHandler / FilelockTimer creation, an application can get different default thread names from run to run. Backport of https://github.com/ibmruntimes/openj9-openjdk-jdk/pull/640 Signed-off-by: Peter Shipton --- src/java.base/share/classes/java/util/Timer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/util/Timer.java b/src/java.base/share/classes/java/util/Timer.java index 072a08ca0e1..b6ce7635482 100644 --- a/src/java.base/share/classes/java/util/Timer.java +++ b/src/java.base/share/classes/java/util/Timer.java @@ -25,7 +25,7 @@ /* * =========================================================================== - * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved + * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved * =========================================================================== */ @@ -532,6 +532,7 @@ class TimerThread extends Thread { private TaskQueue queue; TimerThread(TaskQueue queue) { + super("java.util.TimerThread"); this.queue = queue; } From 4a76dcc228422513912be63114e5aa14d8972991 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Thu, 10 Aug 2023 10:58:06 -0400 Subject: [PATCH 2/3] Revert "8307603: [AIX] Broken build after JDK-8307301" This reverts commit f8aa576a5e31c877edbfe9bafd30c08904b1f3d4. --- src/java.desktop/share/native/libharfbuzz/hb-subset.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc index 538f4ec64bf..ff591cb259f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc @@ -43,11 +43,7 @@ #include "OT/Color/sbix/sbix.hh" #include "hb-ot-os2-table.hh" #include "hb-ot-post-table.hh" - -#if !defined(AIX) #include "hb-ot-post-table-v2subset.hh" -#endif - #include "hb-ot-cff1-table.hh" #include "hb-ot-cff2-table.hh" #include "hb-ot-vorg-table.hh" From 82e2ec753bf09514d532590ac084211e99ff69d5 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Thu, 10 Aug 2023 11:14:25 -0400 Subject: [PATCH 3/3] Update hb-map.hh Apply the fix for harfbuzz#4138. Signed-off-by: Keith W. Campbell --- src/java.desktop/share/native/libharfbuzz/hb-map.hh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh index 69a3186e1bb..01d058e6a11 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-map.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-map.hh @@ -347,8 +347,7 @@ struct hb_hashmap_t ) auto keys () const HB_AUTO_RETURN ( - + iter_items () - | hb_map (&item_t::get_key) + + keys_ref () | hb_map (hb_ridentity) ) auto values_ref () const HB_AUTO_RETURN @@ -358,8 +357,7 @@ struct hb_hashmap_t ) auto values () const HB_AUTO_RETURN ( - + iter_items () - | hb_map (&item_t::get_value) + + values_ref () | hb_map (hb_ridentity) )