Merge to tag jdk-27+20

make/autoconf/buildjdk-spec.gmk.template

@@ -108,3 +108,4 @@ override EXTRA_LDFLAGS :=
 # hsdis is not needed
 HSDIS_BACKEND := none
 ENABLE_HSDIS_BUNDLING := false
+DEFAULT_PRINT_ASSEMBLY_OPTIONS :=

make/autoconf/lib-hsdis.m4

@@ -417,4 +417,9 @@ AC_DEFUN_ONCE([LIB_SETUP_HSDIS],
     AC_MSG_RESULT([no])
   fi
   AC_SUBST(ENABLE_HSDIS_BUNDLING)
+
+  UTIL_ARG_WITH(NAME: print-assembly-options, TYPE: string,
+      DEFAULT: [], RESULT: DEFAULT_PRINT_ASSEMBLY_OPTIONS,
+      DESC: [default value for the PrintAssemblyOptions diagnostic flag, passed verbatim to the disassembler])
+  AC_SUBST(DEFAULT_PRINT_ASSEMBLY_OPTIONS)
 ])

make/autoconf/spec.gmk.template

@@ -381,6 +381,7 @@ HSDIS_CFLAGS := @HSDIS_CFLAGS@
 HSDIS_LDFLAGS := @HSDIS_LDFLAGS@
 HSDIS_LIBS := @HSDIS_LIBS@
 CAPSTONE_ARCH_AARCH64_NAME := @CAPSTONE_ARCH_AARCH64_NAME@
+DEFAULT_PRINT_ASSEMBLY_OPTIONS := @DEFAULT_PRINT_ASSEMBLY_OPTIONS@
 
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
 # it in sync.

make/hotspot/lib/JvmFlags.gmk

@@ -102,6 +102,10 @@ ifneq ($(HOTSPOT_OVERRIDE_LIBPATH), )
   JVM_CFLAGS += -DOVERRIDE_LIBPATH='"$(HOTSPOT_OVERRIDE_LIBPATH)"'
 endif
 
+ifneq ($(DEFAULT_PRINT_ASSEMBLY_OPTIONS), )
+  JVM_CFLAGS += -DDEFAULT_PRINT_ASSEMBLY_OPTIONS='"$(DEFAULT_PRINT_ASSEMBLY_OPTIONS)"'
+endif
+
 ifeq ($(ENABLE_COMPATIBLE_CDS_ALIGNMENT), true)
   JVM_CFLAGS += -DCOMPATIBLE_CDS_ALIGNMENT
 endif

make/jdk/src/classes/build/tools/cldrconverter/BundleGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, 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 @@ String getClassName() {
     };
 
     public void generateBundle(String packageName, String baseName, String localeID,
-            boolean useJava, Map<String, ?> map, BundleType type) throws IOException;
+            Map<String, ?> map, BundleType type) throws IOException;
 
     public void generateMetaInfo(Map<String, SortedSet<String>> metaInfo) throws IOException;
 }

make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java

@@ -183,7 +183,6 @@ String getKeyword() {
         }
     }
 
-    static boolean USE_UTF8 = false;
     private static boolean verbose;
 
     private CLDRConverter() {
@@ -232,10 +231,6 @@ public static void main(String[] args) throws Exception {
                         DESTINATION_DIR = args[++i];
                         break;
 
-                    case "-utf8":
-                        USE_UTF8 = true;
-                        break;
-
                     case "-verbose":
                         verbose = true;
                         break;
@@ -336,7 +331,6 @@ private static void usage() {
                 + "\t-year year     copyright year in output%n"
                 + "\t-zntempfile    template file for java.time.format.ZoneName.java%n"
                 + "\t-tzdatadir     tzdata directory for java.time.format.ZoneName.java%n"
-                + "\t-utf8          use UTF-8 rather than \\uxxxx (for debug)%n"
                 + "\t-jdk-header-template <file>%n"
                 + "\t\t       override default GPL header with contents of file%n");
     }
@@ -612,31 +606,31 @@ private static void convertBundles(List<Bundle> bundles) throws Exception {
             if (bundleTypes.contains(Bundle.Type.LOCALENAMES)) {
                 Map<String, Object> localeNamesMap = extractLocaleNames(targetMap, id);
                 if (!localeNamesMap.isEmpty() || bundle.isRoot()) {
-                    bundleGenerator.generateBundle("util", "LocaleNames", id, true, localeNamesMap, BundleType.OPEN);
+                    bundleGenerator.generateBundle("util", "LocaleNames", id, localeNamesMap, BundleType.OPEN);
                 }
             }
             if (bundleTypes.contains(Bundle.Type.CURRENCYNAMES)) {
                 Map<String, Object> currencyNamesMap = extractCurrencyNames(targetMap, id, bundle.getCurrencies());
                 if (!currencyNamesMap.isEmpty() || bundle.isRoot()) {
-                    bundleGenerator.generateBundle("util", "CurrencyNames", id, true, currencyNamesMap, BundleType.OPEN);
+                    bundleGenerator.generateBundle("util", "CurrencyNames", id, currencyNamesMap, BundleType.OPEN);
                 }
             }
             if (bundleTypes.contains(Bundle.Type.TIMEZONENAMES)) {
                 Map<String, Object> zoneNamesMap = extractZoneNames(targetMap, id);
                 if (!zoneNamesMap.isEmpty() || bundle.isRoot()) {
-                    bundleGenerator.generateBundle("util", "TimeZoneNames", id, true, zoneNamesMap, BundleType.TIMEZONE);
+                    bundleGenerator.generateBundle("util", "TimeZoneNames", id, zoneNamesMap, BundleType.TIMEZONE);
                 }
             }
             if (bundleTypes.contains(Bundle.Type.CALENDARDATA)) {
                 Map<String, Object> calendarDataMap = extractCalendarData(targetMap, id);
                 if (!calendarDataMap.isEmpty() || bundle.isRoot()) {
-                    bundleGenerator.generateBundle("util", "CalendarData", id, true, calendarDataMap, BundleType.PLAIN);
+                    bundleGenerator.generateBundle("util", "CalendarData", id, calendarDataMap, BundleType.PLAIN);
                 }
             }
             if (bundleTypes.contains(Bundle.Type.FORMATDATA)) {
                 Map<String, Object> formatDataMap = extractFormatData(targetMap, id);
                 if (!formatDataMap.isEmpty() || bundle.isRoot()) {
-                    bundleGenerator.generateBundle("text", "FormatData", id, true, formatDataMap, BundleType.PLAIN);
+                    bundleGenerator.generateBundle("text", "FormatData", id, formatDataMap, BundleType.PLAIN);
                 }
             }
 
@@ -1053,28 +1047,15 @@ private static void copyIfPresent(Map<String, Object> src, String key, Map<Strin
         }
     }
 
-    // --- code below here is adapted from java.util.Properties ---
-    private static final String specialSaveCharsJava = "\"";
-    private static final String specialSaveCharsProperties = "=: \t\r\n\f#!";
-
     /*
-     * Converts unicodes to encoded &#92;uxxxx
-     * and writes out any of the characters in specialSaveChars
-     * with a preceding slash
+     * Escapes control codes to ASCII escapes or encoded &#92;uxxxx
+     * and writes out ASCII quotation marks with a preceding slash
      */
-    static String saveConvert(String theString, boolean useJava) {
+    static String escape(String theString) {
         if (theString == null) {
             return "";
         }
 
-        String specialSaveChars;
-        if (useJava) {
-            specialSaveChars = specialSaveCharsJava;
-        } else {
-            specialSaveChars = specialSaveCharsProperties;
-        }
-        boolean escapeSpace = false;
-
         int len = theString.length();
         StringBuilder outBuffer = new StringBuilder(len * 2);
         Formatter formatter = new Formatter(outBuffer, Locale.ROOT);
@@ -1083,14 +1064,14 @@ static String saveConvert(String theString, boolean useJava) {
             char aChar = theString.charAt(x);
             switch (aChar) {
             case ' ':
-                if (x == 0 || escapeSpace) {
+                if (x == 0) {
                     outBuffer.append('\\');
                 }
                 outBuffer.append(' ');
                 break;
-            case '\\':
-                outBuffer.append('\\');
+            case '\\', '"':
                 outBuffer.append('\\');
+                outBuffer.append(aChar);
                 break;
             case '\t':
                 outBuffer.append('\\');
@@ -1109,12 +1090,9 @@ static String saveConvert(String theString, boolean useJava) {
                 outBuffer.append('f');
                 break;
             default:
-                if (aChar < 0x0020 || (!USE_UTF8 && aChar > 0x007e)) {
+                if (aChar < 0x0020) {
                     formatter.format("\\u%04x", (int)aChar);
                 } else {
-                    if (specialSaveChars.indexOf(aChar) != -1) {
-                        outBuffer.append('\\');
-                    }
                     outBuffer.append(aChar);
                 }
             }

make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java

@@ -70,9 +70,8 @@ class ResourceBundleGenerator implements BundleGenerator {
     private static final String META_VALUE_PREFIX = "metaValue_";
 
     @Override
-    public void generateBundle(String packageName, String baseName, String localeID, boolean useJava,
+    public void generateBundle(String packageName, String baseName, String localeID,
                                Map<String, ?> map, BundleType type) throws IOException {
-        String suffix = useJava ? ".java" : ".properties";
         String dirName = CLDRConverter.DESTINATION_DIR + File.separator + "sun" + File.separator
                 + packageName + File.separator + "resources" + File.separator + "cldr";
         packageName = packageName + ".resources.cldr";
@@ -91,23 +90,12 @@ public void generateBundle(String packageName, String baseName, String localeID,
         if (!dir.exists()) {
             dir.mkdirs();
         }
-        File file = new File(dir, baseName + ("root".equals(localeID) ? "" : "_" + localeID) + suffix);
+        File file = new File(dir, baseName + ("root".equals(localeID) ? "" : "_" + localeID) + ".java");
         if (!file.exists()) {
             file.createNewFile();
         }
         CLDRConverter.info("\tWriting file " + file);
 
-        String encoding;
-        if (useJava) {
-            if (CLDRConverter.USE_UTF8) {
-                encoding = "utf-8";
-            } else {
-                encoding = "us-ascii";
-            }
-        } else {
-            encoding = "iso-8859-1";
-        }
-
         Formatter fmt = null;
         if (type == BundleType.TIMEZONE) {
             fmt = new Formatter();
@@ -119,7 +107,7 @@ public void generateBundle(String packageName, String baseName, String localeID,
                     value = (String[]) map.get(key);
                     fmt.format("        final String[] %s = new String[] {\n", meta);
                     for (String s : value) {
-                        fmt.format("               \"%s\",\n", CLDRConverter.saveConvert(s, useJava));
+                        fmt.format("               \"%s\",\n", CLDRConverter.escape(s));
                     }
                     fmt.format("            };\n");
                     metaKeys.add(key);
@@ -159,11 +147,11 @@ public void generateBundle(String packageName, String baseName, String localeID,
                         if (val instanceof String[] values) {
                             fmt.format("        final String[] %s = new String[] {\n", metaVal);
                             for (String s : values) {
-                                fmt.format("            \"%s\",\n", CLDRConverter.saveConvert(s, useJava));
+                                fmt.format("            \"%s\",\n", CLDRConverter.escape(s));
                             }
                             fmt.format("        };\n");
                         } else {
-                            fmt.format("        final String %s = \"%s\";\n", metaVal, CLDRConverter.saveConvert((String)val, useJava));
+                            fmt.format("        final String %s = \"%s\";\n", metaVal, CLDRConverter.escape((String)val));
                         }
                         newMap.put(oldEntry.key, oldEntry.metaKey());
                     }
@@ -173,55 +161,47 @@ public void generateBundle(String packageName, String baseName, String localeID,
             map = newMap;
         }
 
-        try (PrintWriter out = new PrintWriter(file, encoding)) {
+        try (PrintWriter out = new PrintWriter(file, "utf-8")) {
             // Output copyright headers
             out.println(getOpenJDKCopyright());
             out.println(CopyrightHeaders.getUnicodeCopyright());
 
-            if (useJava) {
-                out.println("package sun." + packageName + ";\n");
-                out.printf("import %s;\n\n", type.getPathName());
-                out.printf("public class %s%s extends %s {\n", baseName, "root".equals(localeID) ? "" : "_" + localeID, type.getClassName());
+            out.println("package sun." + packageName + ";\n");
+            out.printf("import %s;\n\n", type.getPathName());
+            out.printf("public class %s%s extends %s {\n", baseName, "root".equals(localeID) ? "" : "_" + localeID, type.getClassName());
 
-                out.println("    @Override\n" +
-                            "    protected final Object[][] getContents() {");
-                if (fmt != null) {
-                    out.print(fmt.toString());
-                }
-                out.println("        final Object[][] data = new Object[][] {");
+            out.println("    @Override\n" +
+                        "    protected final Object[][] getContents() {");
+            if (fmt != null) {
+                out.print(fmt.toString());
             }
+            out.println("        final Object[][] data = new Object[][] {");
             for (String key : map.keySet()) {
-                if (useJava) {
-                    Object value = map.get(key);
-                    if (value == null) {
-                        CLDRConverter.warning("null value for " + key);
-                    } else if (value instanceof String) {
-                        String valStr = (String)value;
-                        if (type == BundleType.TIMEZONE &&
-                            !(key.startsWith(CLDRConverter.EXEMPLAR_CITY_PREFIX) ||
-                              key.startsWith(CLDRConverter.METAZONE_DSTOFFSET_PREFIX)) ||
-                            valStr.startsWith(META_VALUE_PREFIX)) {
-                            out.printf("            { \"%s\", %s },\n", key, CLDRConverter.saveConvert(valStr, useJava));
-                        } else {
-                            out.printf("            { \"%s\", \"%s\" },\n", key, CLDRConverter.saveConvert(valStr, useJava));
-                        }
-                    } else if (value instanceof String[]) {
-                        String[] values = (String[]) value;
-                        out.println("            { \"" + key + "\",\n                new String[] {");
-                        for (String s : values) {
-                            out.println("                    \"" + CLDRConverter.saveConvert(s, useJava) + "\",");
-                        }
-                        out.println("                }\n            },");
+                Object value = map.get(key);
+                if (value == null) {
+                    CLDRConverter.warning("null value for " + key);
+                } else if (value instanceof String) {
+                    String valStr = (String)value;
+                    if (type == BundleType.TIMEZONE &&
+                        !(key.startsWith(CLDRConverter.EXEMPLAR_CITY_PREFIX) ||
+                          key.startsWith(CLDRConverter.METAZONE_DSTOFFSET_PREFIX)) ||
+                        valStr.startsWith(META_VALUE_PREFIX)) {
+                        out.printf("            { \"%s\", %s },\n", key, CLDRConverter.escape(valStr));
                     } else {
-                        throw new RuntimeException("unknown value type: " + value.getClass().getName());
+                        out.printf("            { \"%s\", \"%s\" },\n", key, CLDRConverter.escape(valStr));
                     }
+                } else if (value instanceof String[]) {
+                    String[] values = (String[]) value;
+                    out.println("            { \"" + key + "\",\n                new String[] {");
+                    for (String s : values) {
+                        out.println("                    \"" + CLDRConverter.escape(s) + "\",");
+                    }
+                    out.println("                }\n            },");
                 } else {
-                    out.println(key + "=" + CLDRConverter.saveConvert((String) map.get(key), useJava));
+                    throw new RuntimeException("unknown value type: " + value.getClass().getName());
                 }
             }
-            if (useJava) {
-                out.println("        };\n        return data;\n    }\n}");
-            }
+            out.println("        };\n        return data;\n    }\n}");
         }
     }
 

make/modules/java.base/Gensrc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, 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
@@ -47,8 +47,6 @@ CLDR_GEN_DONE := $(GENSRC_DIR)/_cldr-gensrc.marker
 TZ_DATA_DIR := $(MODULE_SRC)/share/data/tzdata
 ZONENAME_TEMPLATE := $(MODULE_SRC)/share/classes/java/time/format/ZoneName.java.template
 
-# The `-utf8` option is used even for US English, as some names
-# may contain non-ASCII characters, such as “Türkiye”.
 $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
     $(wildcard $(CLDR_DATA_DIR)/main/en*.xml) \
     $(wildcard $(CLDR_DATA_DIR)/supplemental/*.xml) \
@@ -64,8 +62,7 @@ $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
 	    -basemodule \
 	    -year $(COPYRIGHT_YEAR) \
 	    -zntempfile $(ZONENAME_TEMPLATE) \
-	    -tzdatadir $(TZ_DATA_DIR) \
-	    -utf8)
+	    -tzdatadir $(TZ_DATA_DIR))
 	$(TOUCH) $@
 
 TARGETS += $(CLDR_GEN_DONE)

make/modules/jdk.localedata/Gensrc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2026, 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,8 +45,7 @@ $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
 	    -baselocales "en-US" \
 	    -year $(COPYRIGHT_YEAR) \
 	    -o $(GENSRC_DIR) \
-	    -tzdatadir $(TZ_DATA_DIR) \
-	    -utf8)
+	    -tzdatadir $(TZ_DATA_DIR))
 	$(TOUCH) $@
 
 TARGETS += $(CLDR_GEN_DONE)