Merge master HEAD into openj9-staging

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

Author: j9build

src/java.base/share/classes/java/io/PipedOutputStream.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -129,16 +129,17 @@ public void write(int b)  throws IOException {
     /**
      * Writes {@code len} bytes from the specified byte array
      * starting at offset {@code off} to this piped output stream.
-     * This method blocks until all the bytes are written to the output
-     * stream.
+     * If {@code len} is not zero, this method blocks until all the
+     * bytes are written to the output stream.
      *
      * @param   b     {@inheritDoc}
      * @param   off   {@inheritDoc}
      * @param   len   {@inheritDoc}
+     * @throws  IndexOutOfBoundsException {@inheritDoc}
      * @throws  IOException if the pipe is <a href=#BROKEN> broken</a>,
      *          {@link #connect(java.io.PipedInputStream) unconnected},
-     *          closed, or if an I/O error occurs.
-     * @throws  IndexOutOfBoundsException {@inheritDoc}
+     *          closed and {@code len} is greater than zero,
+     *          or if an I/O error occurs.
      */
     @Override
     public void write(byte[] b, int off, int len) throws IOException {

src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java

@@ -64,18 +64,27 @@
      * Values should be annotated with the feature's {@code JEP}.
      */
     public enum Feature {
-        // while building the interim javac, the ClassReader will produce a warning when loading a class
-        // keeping the constant of a feature that has been integrated or dropped, serves the purpose of muting such warnings.
+        // The JDK build process involves creating an interim javac which is then
+        // used to compile the rest of the JDK. The jdk.internal.javac.PreviewFeature
+        // annotation from the current sources is used when compiling interim javac.
+        // That's because the javac APIs of the current sources may be annotated with
+        // this annotation and they may be using the enum constants of the current sources.
+        // Furthermore, when compiling interim javac, the class files from the bootstrap JDK get
+        // used and those may also contain the PreviewFeature annotation. However, they may be
+        // using the enum constants of the bootstrap JDK's PreviewFeature annotation.
+        // If javac sees an annotation with an unknown enum constant, it produces a warning,
+        // and that in turn fails the build.
+        // So, in the current sources, we need to preserve the PreviewFeature enum constants
+        // for as long as the interim javac build needs it. As a result, we retain PreviewFeature
+        // enum constants for preview features that are present in the bootstrap JDK.
+        // Older constants can be removed.
+        //
+        // For example, Class-File API became final in JDK 24. As soon as JDK 23 was dropped as
+        // the bootstrap JDK, the CLASSFILE_API enum constant became eligible for removal.
 
         //---
-        IMPLICIT_CLASSES, //to be removed when boot JDK is 25
-        SCOPED_VALUES,
         @JEP(number=505, title="Structured Concurrency", status="Fifth Preview")
         STRUCTURED_CONCURRENCY,
-        CLASSFILE_API,
-        STREAM_GATHERERS,
-        MODULE_IMPORTS, //remove when the boot JDK is JDK 25
-        KEY_DERIVATION, //remove when the boot JDK is JDK 25
         @JEP(number = 502, title = "Stable Values", status = "Preview")
         STABLE_VALUES,
         @JEP(number=470, title="PEM Encodings of Cryptographic Objects", status="Preview")

src/java.base/windows/classes/java/io/WinNTFileSystem.java

@@ -482,27 +482,12 @@ public String canonicalize(String path) throws IOException {
                 return path;
             return "" + ((char) (c-32)) + ':' + '\\';
         }
-        String canonicalPath = canonicalize0(path);
-        String finalPath = null;
-        try {
-            finalPath = getFinalPath(canonicalPath);
-        } catch (IOException ignored) {
-            finalPath = canonicalPath;
-        }
-        return finalPath;
+        return canonicalize0(path);
     }
 
     private native String canonicalize0(String path)
             throws IOException;
 
-    private String getFinalPath(String path) throws IOException {
-        return getFinalPath0(path);
-    }
-
-    private native String getFinalPath0(String path)
-            throws IOException;
-
-
     /* -- Attribute accessors -- */
 
     @Override

src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, 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
@@ -116,22 +116,18 @@ public class HostLocaleProviderAdapterImpl {
     private static final String nativeDisplayLanguage;
     static {
         Set<Locale> tmpSet = new HashSet<>();
-        if (initialize()) {
-            // Assuming the default locales do not include any extensions, so
-            // no stripping is needed here.
-            Control c = Control.getNoFallbackControl(Control.FORMAT_DEFAULT);
-            String displayLocale = getDefaultLocale(CAT_DISPLAY);
-            Locale l = Locale.forLanguageTag(displayLocale.replace('_', '-'));
+        // Assuming the default locales do not include any extensions, so
+        // no stripping is needed here.
+        Control c = Control.getNoFallbackControl(Control.FORMAT_DEFAULT);
+        String displayLocale = getDefaultLocale(CAT_DISPLAY);
+        Locale l = Locale.forLanguageTag(displayLocale.replace('_', '-'));
+        tmpSet.addAll(c.getCandidateLocales("", l));
+        nativeDisplayLanguage = l.getLanguage();
+
+        String formatLocale = getDefaultLocale(CAT_FORMAT);
+        if (!formatLocale.equals(displayLocale)) {
+            l = Locale.forLanguageTag(formatLocale.replace('_', '-'));
             tmpSet.addAll(c.getCandidateLocales("", l));
-            nativeDisplayLanguage = l.getLanguage();
-
-            String formatLocale = getDefaultLocale(CAT_FORMAT);
-            if (!formatLocale.equals(displayLocale)) {
-                l = Locale.forLanguageTag(formatLocale.replace('_', '-'));
-                tmpSet.addAll(c.getCandidateLocales("", l));
-            }
-        } else {
-            nativeDisplayLanguage = "";
         }
         supportedLocaleSet = Collections.unmodifiableSet(tmpSet);
     }
@@ -850,7 +846,6 @@ private static Locale getNumberLocale(Locale src) {
     // native methods
 
     // initialize
-    private static native boolean initialize();
     private static native String getDefaultLocale(int cat);
 
     // For DateFormatProvider

src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, 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
@@ -39,15 +39,6 @@
 #define CALENDAR_STYLE_SHORT_MASK       0x00000001  // Calendar.SHORT
 #define CALENDAR_STYLE_STANDALONE_MASK  0x00008000  // Calendar.STANDALONE
 
-// global variables
-typedef int (WINAPI *PGLIE)(const jchar *, LCTYPE, LPWSTR, int);
-typedef int (WINAPI *PGCIE)(const jchar *, CALID, LPCWSTR, CALTYPE, LPWSTR, int, LPDWORD);
-typedef int (WINAPI *PECIEE)(CALINFO_ENUMPROCEXEX, const jchar *, CALID, LPCWSTR, CALTYPE, LPARAM);
-PGLIE pGetLocaleInfoEx;
-PGCIE pGetCalendarInfoEx;
-PECIEE pEnumCalendarInfoExEx;
-BOOL initialized = FALSE;
-
 // prototypes
 int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen);
 int getCalendarInfoWrapper(const jchar *langtag, CALID id, LPCWSTR reserved, CALTYPE type, LPWSTR data, int buflen, LPDWORD val);
@@ -178,31 +169,6 @@ WCHAR * fixes[2][2][3][16] =
     }
 };
 
-/*
- * Class:     sun_util_locale_provider_HostLocaleProviderAdapterImpl
- * Method:    initialize
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_initialize
-  (JNIEnv *env, jclass cls) {
-    if (!initialized) {
-        pGetLocaleInfoEx = (PGLIE)GetProcAddress(
-            GetModuleHandle("kernel32.dll"),
-            "GetLocaleInfoEx");
-        pGetCalendarInfoEx = (PGCIE)GetProcAddress(
-            GetModuleHandle("kernel32.dll"),
-            "GetCalendarInfoEx");
-        pEnumCalendarInfoExEx = (PECIEE)GetProcAddress(
-            GetModuleHandle("kernel32.dll"),
-            "EnumCalendarInfoExEx");
-        initialized =TRUE;
-    }
-
-    return pGetLocaleInfoEx != NULL &&
-           pGetCalendarInfoEx != NULL &&
-           pEnumCalendarInfoExEx != NULL;
-}
-
 /*
  * Class:     sun_util_locale_provider_HostLocaleProviderAdapterImpl
  * Method:    getDefaultLocale
@@ -768,34 +734,20 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
 }
 
 int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen) {
-    if (pGetLocaleInfoEx) {
-        if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
-            // defaults to "en"
-            return pGetLocaleInfoEx(L"en", type, data, buflen);
-        } else {
-            return pGetLocaleInfoEx((LPWSTR)langtag, type, data, buflen);
-        }
+    if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
+        // defaults to "en"
+        return GetLocaleInfoEx(L"en", type, data, buflen);
     } else {
-        // If we ever wanted to support WinXP, we will need extra module from
-        // MS...
-        // return GetLocaleInfo(DownlevelLocaleNameToLCID(langtag, 0), type, data, buflen);
-        return 0;
+        return GetLocaleInfoEx((LPWSTR)langtag, type, data, buflen);
     }
 }
 
 int getCalendarInfoWrapper(const jchar *langtag, CALID id, LPCWSTR reserved, CALTYPE type, LPWSTR data, int buflen, LPDWORD val) {
-    if (pGetCalendarInfoEx) {
-        if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
-            // defaults to "en"
-            return pGetCalendarInfoEx(L"en", id, reserved, type, data, buflen, val);
-        } else {
-            return pGetCalendarInfoEx((LPWSTR)langtag, id, reserved, type, data, buflen, val);
-        }
+    if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
+        // defaults to "en"
+        return GetCalendarInfoEx(L"en", id, reserved, type, data, buflen, val);
     } else {
-        // If we ever wanted to support WinXP, we will need extra module from
-        // MS...
-        // return GetCalendarInfo(DownlevelLocaleNameToLCID(langtag, 0), ...);
-        return 0;
+        return GetCalendarInfoEx((LPWSTR)langtag, id, reserved, type, data, buflen, val);
     }
 }
 
@@ -1000,17 +952,13 @@ void getFixPart(const jchar * langtag, const jint numberStyle, BOOL positive, BO
 }
 
 int enumCalendarInfoWrapper(const jchar *langtag, CALID calid, CALTYPE type, LPWSTR buf, int buflen) {
-    if (pEnumCalendarInfoExEx) {
-        if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
-            // defaults to "en"
-            return pEnumCalendarInfoExEx(&EnumCalendarInfoProc, L"en",
-                calid, NULL, type, (LPARAM)buf);
-        } else {
-            return pEnumCalendarInfoExEx(&EnumCalendarInfoProc, langtag,
-                calid, NULL, type, (LPARAM)buf);
-        }
+    if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
+        // defaults to "en"
+        return EnumCalendarInfoExEx(&EnumCalendarInfoProc, L"en",
+            calid, NULL, type, (LPARAM)buf);
     } else {
-        return 0;
+        return EnumCalendarInfoExEx(&EnumCalendarInfoProc, langtag,
+            calid, NULL, type, (LPARAM)buf);
     }
 }
 

src/java.base/windows/native/libjava/WinNTFileSystem_md.c

@@ -59,7 +59,7 @@ Java_java_io_WinNTFileSystem_initIDs(JNIEnv *env, jclass cls)
 
 /* -- Path operations -- */
 
-extern int wcanonicalize(const WCHAR *path, WCHAR *out, int len);
+extern WCHAR* wcanonicalize(const WCHAR *path, WCHAR *out, int len);
 
 /**
  * Retrieves the fully resolved (final) path for the given path or NULL
@@ -274,18 +274,23 @@ Java_java_io_WinNTFileSystem_canonicalize0(JNIEnv *env, jobject this,
          */
         int len = (int)wcslen(path);
         len += currentDirLength(path, len);
+        WCHAR* fp;
         if (len  > MAX_PATH_LENGTH - 1) {
             WCHAR *cp = (WCHAR*)malloc(len * sizeof(WCHAR));
             if (cp != NULL) {
-                if (wcanonicalize(path, cp, len) >= 0) {
-                    rv = (*env)->NewString(env, cp, (jsize)wcslen(cp));
+                if ((fp = wcanonicalize(path, cp, len)) != NULL) {
+                    rv = (*env)->NewString(env, fp, (jsize)wcslen(fp));
+                    if (fp != cp)
+                        free(fp);
                 }
                 free(cp);
             } else {
                 JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
             }
-        } else if (wcanonicalize(path, canonicalPath, MAX_PATH_LENGTH) >= 0) {
-            rv = (*env)->NewString(env, canonicalPath, (jsize)wcslen(canonicalPath));
+        } else if ((fp = wcanonicalize(path, canonicalPath, MAX_PATH_LENGTH)) != NULL) {
+            rv = (*env)->NewString(env, fp, (jsize)wcslen(fp));
+            if (fp != canonicalPath)
+                free(fp);
         }
     } END_UNICODE_STRING(env, path);
     if (rv == NULL && !(*env)->ExceptionCheck(env)) {
@@ -294,26 +299,6 @@ Java_java_io_WinNTFileSystem_canonicalize0(JNIEnv *env, jobject this,
     return rv;
 }
 
-
-JNIEXPORT jstring JNICALL
-Java_java_io_WinNTFileSystem_getFinalPath0(JNIEnv* env, jobject this, jstring pathname) {
-    jstring rv = NULL;
-
-    WITH_UNICODE_STRING(env, pathname, path) {
-        WCHAR* finalPath = getFinalPath(env, path);
-        if (finalPath != NULL) {
-            rv = (*env)->NewString(env, finalPath, (jsize)wcslen(finalPath));
-            free(finalPath);
-        }
-    } END_UNICODE_STRING(env, path);
-
-    if (rv == NULL && !(*env)->ExceptionCheck(env)) {
-        JNU_ThrowIOExceptionWithLastError(env, "Bad pathname");
-    }
-
-    return rv;
-}
-
 /* -- Attribute accessors -- */
 
 /* Check whether or not the file name in "path" is a Windows reserved