Merge master jdk-17.0.16+5 into openj9-staging

Signed-off-by: J9 Build <[email protected]>

Author: j9build

make/data/currency/CurrencyData.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=177
+dataVersion=179
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -54,7 +54,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-SLL694-SOS706-\
     SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
     TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
-    UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+    UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAD396-XAF950-XAG961-XAU959-XBA955-\
     XBB956-XBC957-XBD958-XCD951-XCG532-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
     XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWG924-\
     ZWL932-ZWN942-ZWR935

make/modules/jdk.jdwp.agent/Lib.gmk

@@ -55,6 +55,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     DISABLED_WARNINGS_gcc := unused-function, \
     DISABLED_WARNINGS_clang := sometimes-uninitialized format-nonliteral \
         self-assign, \
+    DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \
     EXTRA_HEADER_DIRS := \
       include \
       libjdwp/export, \

src/java.base/share/classes/sun/util/resources/CurrencyNames.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -258,6 +258,7 @@ VES=VES
 VND=VND
 VUV=VUV
 WST=WST
+XAD=XAD
 XAF=XAF
 XAG=XAG
 XAU=XAU
@@ -485,6 +486,7 @@ ves=Venezuelan Bol\u00edvar Soberano
 vnd=Vietnamese Dong
 vuv=Vanuatu Vatu
 wst=Samoan Tala
+xad=Arab Accounting Dinar
 xaf=CFA Franc BEAC
 xag=Silver
 xau=Gold

src/java.desktop/share/classes/javax/swing/JColorChooser.java

@@ -175,7 +175,9 @@ public static Color showDialog(Component component,
      * @return the selected color or <code>null</code> if the user opted out
      * @exception HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
+     *
      * @see java.awt.GraphicsEnvironment#isHeadless
+     * @since 9
      */
     @SuppressWarnings("deprecation")
     public static Color showDialog(Component component, String title,

src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java

@@ -229,6 +229,7 @@ void setSelectedColor(Color color) {
      *
      * @param b true if the transparency of a color can be selected
      * @see #isColorTransparencySelectionEnabled()
+     * @since 9
      */
     @BeanProperty(description
             = "Sets the transparency of a color selection on or off.")
@@ -241,6 +242,7 @@ public void setColorTransparencySelectionEnabled(boolean b){
      *
      * @return true if the transparency of a color can be selected
      * @see #setColorTransparencySelectionEnabled(boolean)
+     * @since 9
      */
     public boolean isColorTransparencySelectionEnabled(){
         return true;

src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredHost.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
  * @see HostListener
  */
 public abstract class MonitoredHost {
-    private static Map<HostIdentifier, MonitoredHost> monitoredHosts =
+    private static final Map<HostIdentifier, MonitoredHost> monitoredHosts =
                 new HashMap<HostIdentifier, MonitoredHost>();
 
     /*
@@ -133,13 +133,6 @@ public static MonitoredHost getMonitoredHost(VmIdentifier vmid)
         return getMonitoredHost(hostId);
     }
 
-
-    /*
-     * Load the MonitoredHostServices
-     */
-    private static ServiceLoader<MonitoredHostService> monitoredHostServiceLoader =
-        ServiceLoader.load(MonitoredHostService.class, MonitoredHostService.class.getClassLoader());
-
     /**
      * Factory method to construct a MonitoredHost instance to manage the
      * connection to the host indicated by {@code hostId}.
@@ -167,9 +160,12 @@ public static MonitoredHost getMonitoredHost(HostIdentifier hostId)
 
         hostId = resolveHostId(hostId);
 
-        for (MonitoredHostService mhs : monitoredHostServiceLoader) {
+        ServiceLoader<MonitoredHostService> services = ServiceLoader.load(
+                MonitoredHostService.class, MonitoredHostService.class.getClassLoader());
+        for (MonitoredHostService mhs : services) {
             if (mhs.getScheme().equals(hostId.getScheme())) {
                 mh = mhs.getMonitoredHost(hostId);
+                break;
             }
         }
 

test/failure_handler/src/share/conf/linux.properties

@@ -54,8 +54,11 @@ native.stack.args.delimiter=\0
 native.stack.params.repeat=6
 
 # has to be the last command
-native.core.app=kill
-native.core.args=-ABRT %p
+native.core.app=bash
+# The below trick was found on https://stackoverflow.com/a/41613532
+native.core.args=-c\0kill -ABRT %p && tail --pid=%p -f /dev/null
+native.core.args.delimiter=\0
+native.core.timeout=600000
 
 cores=native.gdb
 native.gdb.app=gdb

test/failure_handler/src/share/conf/mac.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -62,12 +62,18 @@ native.stack.params.repeat=6
 native.stack.args=-c\0DevToolsSecurity --status | grep -q enabled && lldb -o 'attach %p' -o 'thread backtrace all' -o 'detach' -o 'quit'
 
 # has to be the last command
-native.core.app=kill
-native.core.args=-ABRT %p
+native.core.app=bash
+# The below trick was found on https://stackoverflow.com/a/41613532
+native.core.args=-c\0kill -ABRT %p && lsof -p %p +r 1 &>/dev/null
+native.core.delimiter=\0
+native.core.timeout=600000
 
 cores=native.lldb
 native.lldb.app=lldb
 native.lldb.delimiter=\0
+# Core files can be very big and take a long time to load on macosx-aarch64.
+# The 20 seconds default timeout is not nearly enough.
+native.lldb.timeout=120000
 # Assume that java standard laucher has been used
 native.lldb.args=--core\0%p\0%java\0-o\0thread backtrace all\0-o\0quit
 

test/hotspot/jtreg/compiler/parsing/MissingSafepointOnSwitch.jasm

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+super public class MissingSafepointOnSwitch
+	version 52:0
+{
+  public Method "<init>":"()V"
+	stack 1 locals 1
+  {
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+  }
+  /* Same as:
+    public static void test(boolean flag, int v) {
+        if (flag) {
+            loop:
+            for (; ; ) {
+                switch(v) {
+                    case 0:
+                    case 1:
+                    case 2:
+                        break loop;
+                    default:
+                }
+            }
+        }
+    }
+    but with the default: set to the loop entry
+  */
+  public static Method test:"(ZI)V"
+	stack 1 locals 2
+  {
+		iload_0;
+		ifeq	L32;
+	L4:	stack_frame_type same;
+		iload_1;
+		tableswitch{ //0 to 2
+		0: L32;
+		1: L32;
+		2: L32;
+		default: L4 };
+	L32:	stack_frame_type same;
+		return;
+  }
+
+} // end Class TestMissingSafepointOnSwitch

test/hotspot/jtreg/compiler/parsing/TestMissingSafepointOnSwitch.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8306997
+ * @summary C2: "malformed control flow" assert due to missing safepoint on backedge with a switch
+ * @compile MissingSafepointOnSwitch.jasm
+ * @run main/othervm -Xcomp -XX:CompileOnly=MissingSafepointOnSwitch::test TestMissingSafepointOnSwitch
+ */
+
+public class TestMissingSafepointOnSwitch {
+    public static void main(String[] args) {
+        MissingSafepointOnSwitch.test(false, 0);
+    }
+
+}