Merge master HEAD into openj9-staging

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

Author: j9build

Diff for: src/java.base/share/classes/java/util/Currency.java

@@ -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
@@ -444,8 +444,8 @@ public static Currency getInstance(Locale locale) {
     public static Set<Currency> getAvailableCurrencies() {
         synchronized(Currency.class) {
             if (available == null) {
+                var sysTime = System.currentTimeMillis();
                 available = new HashSet<>(256);
-
                 // Add simple currencies first
                 for (char c1 = 'A'; c1 <= 'Z'; c1 ++) {
                     for (char c2 = 'A'; c2 <= 'Z'; c2 ++) {
@@ -467,7 +467,7 @@ public static Set<Currency> getAvailableCurrencies() {
                             SpecialCaseEntry scEntry = specialCasesList.get(index);
 
                             if (scEntry.cutOverTime == Long.MAX_VALUE
-                                    || System.currentTimeMillis() < scEntry.cutOverTime) {
+                                    || sysTime < scEntry.cutOverTime) {
                                 available.add(getInstance(scEntry.oldCurrency,
                                         scEntry.oldCurrencyFraction,
                                         scEntry.oldCurrencyNumericCode));

Diff for: src/java.base/share/classes/java/util/TimeZone.java

@@ -41,6 +41,7 @@
 import java.io.Serializable;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.stream.Stream;
 
 import jdk.internal.util.StaticProperty;
 import sun.util.calendar.ZoneInfo;
@@ -615,24 +616,63 @@ private static TimeZone getTimeZone(String ID, boolean fallback) {
     /**
      * Gets the available IDs according to the given time zone offset in milliseconds.
      *
+     * @apiNote Consider using {@link #availableIDs(int)} which returns
+     * a stream of the available time zone IDs according to the given offset.
+     *
      * @param rawOffset the given time zone GMT offset in milliseconds.
      * @return an array of IDs, where the time zone for that ID has
      * the specified GMT offset. For example, "America/Phoenix" and "America/Denver"
      * both have GMT-07:00, but differ in daylight saving behavior.
      * @see #getRawOffset()
+     * @see #availableIDs(int)
      */
     public static String[] getAvailableIDs(int rawOffset) {
         return ZoneInfo.getAvailableIDs(rawOffset);
     }
 
     /**
-     * Gets all the available IDs supported.
-     * @return an array of IDs.
+     * {@return an array of the available IDs supported}
+     *
+     * @apiNote Consider using {@link #availableIDs()} which returns
+     * a stream of the available time zone IDs.
+     *
+     * @see #availableIDs()
      */
     public static String[] getAvailableIDs() {
         return ZoneInfo.getAvailableIDs();
     }
 
+    /**
+     * Gets the available IDs according to the given time zone offset in milliseconds.
+     *
+     * @implNote Unlike {@link #getAvailableIDs(int)}, this method does
+     * not create a copy of the {@code TimeZone} IDs array.
+     *
+     * @param rawOffset the given time zone GMT offset in milliseconds.
+     * @return a stream of IDs, where the time zone for that ID has
+     * the specified GMT offset. For example, "America/Phoenix" and "America/Denver"
+     * both have GMT-07:00, but differ in daylight saving behavior.
+     * @see #getRawOffset()
+     * @see #getAvailableIDs(int)
+     * @since 25
+     */
+    public static Stream<String> availableIDs(int rawOffset) {
+        return ZoneInfo.availableIDs(rawOffset);
+    }
+
+    /**
+     * {@return a stream of the available IDs supported}
+     *
+     * @implNote Unlike {@link #getAvailableIDs()}, this method does
+     * not create a copy of the {@code TimeZone} IDs array.
+     *
+     * @since 25
+     * @see #getAvailableIDs()
+     */
+    public static Stream<String> availableIDs() {
+        return ZoneInfo.availableIDs();
+    }
+
     /**
      * Gets the platform defined TimeZone ID.
      **/

Diff for: src/java.base/share/classes/sun/util/calendar/ZoneInfo.java

@@ -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
@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
+import java.util.stream.Stream;
 
 /**
  * <code>ZoneInfo</code> is an implementation subclass of {@link
@@ -562,6 +563,27 @@ public static String[] getAvailableIDs(int rawOffset) {
         return ZoneInfoFile.getZoneIds(rawOffset);
     }
 
+    /**
+     * Gets all available IDs supported in the Java run-time.
+     *
+     * @return a stream of time zone IDs.
+     */
+    public static Stream<String> availableIDs() {
+        return ZoneInfoFile.zoneIds();
+    }
+
+    /**
+     * Gets all available IDs that have the same value as the
+     * specified raw GMT offset.
+     *
+     * @param rawOffset the GMT offset in milliseconds. This
+     * value should not include any daylight saving time.
+     * @return a stream of time zone IDs.
+     */
+    public static Stream<String> availableIDs(int rawOffset) {
+        return ZoneInfoFile.zoneIds(rawOffset);
+    }
+
     /**
      * Gets the ZoneInfo for the given ID.
      *

Diff for: src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -45,6 +45,7 @@
 import java.util.Map;
 import java.util.SimpleTimeZone;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
 import java.util.zip.CRC32;
 
 import jdk.internal.util.StaticProperty;
@@ -59,7 +60,7 @@ public final class ZoneInfoFile {
     /**
      * Gets all available IDs supported in the Java run-time.
      *
-     * @return a set of time zone IDs.
+     * @return an array of time zone IDs.
      */
     public static String[] getZoneIds() {
         var shortIDs = ZoneId.SHORT_IDS.keySet();
@@ -92,11 +93,35 @@ public static String[] getZoneIds(int rawOffset) {
         // sorted list, though the specification does not
         // specify it. Keep the same behavior for better
         // compatibility.
-        String[] list = ids.toArray(new String[ids.size()]);
+        String[] list = ids.toArray(new String[0]);
         Arrays.sort(list);
         return list;
     }
 
+    /**
+     * Gets all available IDs supported in the Java run-time.
+     *
+     * @return a stream of time zone IDs.
+     */
+    public static Stream<String> zoneIds() {
+        return Stream.concat(Arrays.stream(regions),
+                ZoneId.SHORT_IDS.keySet().stream());
+    }
+
+    /**
+     * Gets all available IDs that have the same value as the
+     * specified raw GMT offset.
+     *
+     * @param rawOffset  the GMT offset in milliseconds. This
+     *                   value should not include any daylight saving time.
+     * @return a stream of time zone IDs.
+     */
+    public static Stream<String> zoneIds(int rawOffset) {
+        return zoneIds()
+                .filter(id -> getZoneInfo(id).getRawOffset() == rawOffset)
+                .sorted(); // Sort the IDs, see getZoneIds(int)
+    }
+
     public static ZoneInfo getZoneInfo(String zoneId) {
         if (zoneId == null) {
             return null;

Diff for: src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java

@@ -55,7 +55,7 @@ public class CLDRTimeZoneNameProviderImpl extends TimeZoneNameProviderImpl {
     private static final String NO_INHERITANCE_MARKER = "\u2205\u2205\u2205";
     private static class AVAILABLE_IDS {
         static final String[] INSTANCE =
-            Arrays.stream(ZoneInfoFile.getZoneIds())
+                ZoneInfoFile.zoneIds()
                 .sorted()
                 .toArray(String[]::new);
     }

Diff for: src/java.base/share/native/libzip/zip_util.c

@@ -72,11 +72,9 @@ static void freeCEN(jzfile *);
 static jint INITIAL_META_COUNT = 2;   /* initial number of entries in meta name array */
 
 /*
- * Declare library specific JNI_Onload entry if static build
+ * Declare library specific JNI_Onload entry
  */
-#ifdef STATIC_BUILD
 DEF_STATIC_JNI_OnLoad
-#endif
 
 /*
  * The ZFILE_* functions exist to provide some platform-independence with

Diff for: src/java.desktop/share/classes/sun/print/PathGraphics.java

@@ -934,23 +934,36 @@ boolean printedSimpleGlyphVector(GlyphVector g, float x, float y) {
 
         /* If we reach here we have mapped all the glyphs back
          * one-to-one to simple unicode chars that we know are in the font.
-         * We can call "drawChars" on each one of them in turn, setting
+         * We can call "drawString" on each one of them in turn, setting
          * the position based on the glyph positions.
          * There's typically overhead in this. If numGlyphs is 'large',
          * it may even be better to try printGlyphVector() in this case.
          * This may be less recoverable for apps, but sophisticated apps
          * should be able to recover the text from simple glyph vectors
          * and we can avoid penalising the more common case - although
          * this is already a minority case.
+         * If we do use "drawString" on each character, we need to use a
+         * font without translation transform, since the font translation
+         * transform will already be reflected in the glyph positions, and
+         * we do not want to apply the translation twice.
          */
         if (numGlyphs > 10 && printGlyphVector(g, x, y)) {
             return true;
         }
 
+        Font font2 = font;
+        if (font.isTransformed()) {
+            AffineTransform t = font.getTransform();
+            if ((t.getType() & AffineTransform.TYPE_TRANSLATION) != 0) {
+                t.setTransform(t.getScaleX(), t.getShearY(), t.getShearX(), t.getScaleY(), 0, 0);
+                font2 = font.deriveFont(t);
+            }
+        }
+
         for (int i=0; i<numGlyphs; i++) {
             String s = new String(chars, i, 1);
             drawString(s, x+positions[i*2], y+positions[i*2+1],
-                       font, gvFrc, 0f);
+                       font2, gvFrc, 0f);
         }
         return true;
     }

Diff for: src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c

@@ -24,8 +24,78 @@
  */
 #include <jni.h>
 #include "jni_util.h"
-#define IMGEXTERN
-#include "imageInitIDs.h"
+
+/* BufferedImage ids */
+jfieldID g_BImgRasterID;
+jfieldID g_BImgTypeID;
+jfieldID g_BImgCMID;
+jmethodID g_BImgGetRGBMID;
+jmethodID g_BImgSetRGBMID;
+
+/* Raster ids */
+jfieldID g_RasterWidthID;
+jfieldID g_RasterHeightID;
+jfieldID g_RasterMinXID;
+jfieldID g_RasterMinYID;
+jfieldID g_RasterBaseOriginXID;
+jfieldID g_RasterBaseOriginYID;
+jfieldID g_RasterSampleModelID;
+jfieldID g_RasterDataBufferID;
+jfieldID g_RasterNumDataElementsID;
+jfieldID g_RasterNumBandsID;
+
+jfieldID g_BCRdataID;
+jfieldID g_BCRscanstrID;
+jfieldID g_BCRpixstrID;
+jfieldID g_BCRdataOffsetsID;
+jfieldID g_BCRtypeID;
+jfieldID g_BPRdataID;
+jfieldID g_BPRscanstrID;
+jfieldID g_BPRpixstrID;
+jfieldID g_BPRtypeID;
+jfieldID g_BPRdataBitOffsetID;
+jfieldID g_SCRdataID;
+jfieldID g_SCRscanstrID;
+jfieldID g_SCRpixstrID;
+jfieldID g_SCRdataOffsetsID;
+jfieldID g_SCRtypeID;
+jfieldID g_ICRdataID;
+jfieldID g_ICRscanstrID;
+jfieldID g_ICRpixstrID;
+jfieldID g_ICRdataOffsetsID;
+jfieldID g_ICRtypeID;
+
+/* Color Model ids */
+jfieldID g_CMnBitsID;
+jfieldID g_CMcspaceID;
+jfieldID g_CMnumComponentsID;
+jfieldID g_CMsuppAlphaID;
+jfieldID g_CMisAlphaPreID;
+jfieldID g_CMtransparencyID;
+jfieldID g_CMcsTypeID;
+jfieldID g_CMis_sRGBID;
+jmethodID g_CMgetRGBdefaultMID;
+
+jfieldID g_ICMtransIdxID;
+jfieldID g_ICMmapSizeID;
+jfieldID g_ICMrgbID;
+
+/* Sample Model ids */
+jfieldID g_SMWidthID;
+jfieldID g_SMHeightID;
+jmethodID g_SMGetPixelsMID;
+jmethodID g_SMSetPixelsMID;
+
+/* Single Pixel Packed Sample Model ids */
+jfieldID g_SPPSMmaskArrID;
+jfieldID g_SPPSMmaskOffID;
+jfieldID g_SPPSMnBitsID;
+jfieldID g_SPPSMmaxBitID;
+
+/* Kernel ids */
+jfieldID g_KernelWidthID;
+jfieldID g_KernelHeightID;
+jfieldID g_KernelDataID;
 
 JNIEXPORT void JNICALL
 Java_java_awt_image_BufferedImage_initIDs(JNIEnv *env, jclass cls) {