Merge to tag jdk-28+8

make/ToolsJdk.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
@@ -81,6 +81,9 @@ TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_too
 TOOL_GENERATECASEFOLDING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generatecharacter.GenerateCaseFolding
 
+TOOL_GENERATESPECIALCASING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.generatespecialcasing.GenerateSpecialCasing
+
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible
 

make/autoconf/libraries.m4

@@ -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
@@ -149,7 +149,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib psapi.lib"
+        ws2_32.lib winmm.lib version.lib"
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)

make/jdk/src/classes/build/tools/generatespecialcasing/GenerateSpecialCasing.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package build.tools.generatespecialcasing;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Parses UCD's "SpecialCasing.txt" file and extract selected special case
+ * mappings, then reformats each entry into `Entry` instances in
+ * `java.lang.ConditionalSpecialCasing` class.
+ *
+ * Arguments to this utility:
+ *    args[0]: Full path to the "ConditionalSpecialCasing" template file
+ *    args[1]: Full path to the "SpecialCasing.txt" UCD file
+ *    args[2]: Full path to the generated output file
+ */
+public class GenerateSpecialCasing {
+    // Represents a code point with selected special casing.
+    private record Entry(String codePoint, List<String> lowerCase,
+                         List<String> upperCase, String language,
+                         String condition) {};
+
+    public static void main(String[] args) throws IOException {
+        var templateFile = Paths.get(args[0]);
+        var specialCasingFile = Paths.get(args[1]);
+        var gensrcFile = Paths.get(args[2]);
+
+        List<Entry> entries = Files.lines(specialCasingFile)
+            .filter(Predicate.not(l -> l.startsWith("#") || l.isBlank()))
+            .map(l -> l.replaceFirst("#.*$", "").split(";"))
+            // "U+0130" (LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE)
+            // is needed even if it is non-conditional
+            .filter(l -> !l[4].isBlank() || l[0].equals("0130"))
+            .map(l -> new Entry(l[0],
+                Arrays.asList(l[1].trim().split(" ")),
+                Arrays.asList(l[3].trim().split(" ")),
+                l[4].replaceFirst("[A-Z].*$", "").trim(),
+                l[4].replaceFirst("^[ a-z]*", "").toUpperCase(Locale.ROOT).trim()))
+            .toList();
+
+        // Generate output file
+        Files.write(gensrcFile,
+            Files.lines(templateFile)
+                .flatMap(l -> {
+                    if (l.trim().equals("%%%SpecialCasing%%%")) {
+                        return entries.stream().map(GenerateSpecialCasing::entryToString);
+                    } else {
+                        return Stream.of(l);
+                    }
+                })
+                .collect(Collectors.toList()),
+            StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+    }
+
+    static String entryToString(Entry e) {
+        var codePoint = e.codePoint();
+        if (codePoint == null || codePoint.isBlank()) {
+            throw new RuntimeException("Corrupt entry: " + e);
+        }
+
+        return "        new Entry(%s, new char[]{%s}, new char[]{%s}, %s, %s),"
+           .formatted(
+               "0x" + codePoint,
+               e.lowerCase().stream().map(cp -> cp.isEmpty() ? "" : "0x"+cp).collect(Collectors.joining(",")),
+               e.upperCase().stream().map(cp -> cp.isEmpty() ? "" : "0x"+cp).collect(Collectors.joining(",")),
+               "\"" + e.language() + "\"",
+               e.condition().isEmpty() ? "NONE" : e.condition());
+    }
+}

make/modules/java.base/gensrc/GensrcCharacterData.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
@@ -34,6 +34,9 @@ GENSRC_CHARACTERDATA :=
 
 CHARACTERDATA_TEMPLATES = $(MODULE_SRC)/share/classes/java/lang
 UNICODEDATA = $(MODULE_SRC)/share/data/unicodedata
+SPECIALCASING = $(UNICODEDATA)/SpecialCasing.txt
+DERIVEDCOREPROPS = $(UNICODEDATA)/DerivedCoreProperties.txt
+PROPLIST = $(UNICODEDATA)/PropList.txt
 
 ifneq ($(DEBUG_LEVEL), release)
   ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), true)
@@ -49,9 +52,9 @@ define SetupCharacterData
 	$(TOOL_GENERATECHARACTER) $2 $(DEBUG_OPTION) \
 	    -template $(CHARACTERDATA_TEMPLATES)/$1.java.template \
 	    -spec $(UNICODEDATA)/UnicodeData.txt \
-	    -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-	    -proplist $(UNICODEDATA)/PropList.txt \
-	    -derivedprops $(UNICODEDATA)/DerivedCoreProperties.txt \
+	    -specialcasing $(SPECIALCASING) \
+	    -proplist $(PROPLIST) \
+	    -derivedprops $(DERIVEDCOREPROPS) \
 	    -emojidata $(UNICODEDATA)/emoji/emoji-data.txt \
 	    -o $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java \
 	    -usecharforbyte $3
@@ -88,6 +91,40 @@ $(GENSRC_STRINGCASEFOLDING): $(BUILD_TOOLS_JDK) $(STRINGCASEFOLDING_TEMPLATE) $(
 
 TARGETS += $(GENSRC_STRINGCASEFOLDING)
 
+################################################################################
+# Rule to create $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/ConditionalSpecialCasing.java
+################################################################################
+
+GENSRC_CONDITIONALSPECIALCASING := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/ConditionalSpecialCasing.java
+GENSRC_CONDITIONALSPECIALCASING_SPECIALCASING_TMP := $(GENSRC_CONDITIONALSPECIALCASING).specialcasing.tmp
+GENSRC_CONDITIONALSPECIALCASING_PROPS_TMP := $(GENSRC_CONDITIONALSPECIALCASING).props.tmp
+
+CONDITIONALSPECIALCASINGTEMP := $(MODULE_SRC)/share/classes/java/lang/ConditionalSpecialCasing.java.template
+FINALSIGMAPARAMS := Cased Case_Ignorable
+SOFTDOTTEDPARAMS := Soft_Dotted
+
+$(GENSRC_CONDITIONALSPECIALCASING): $(BUILD_TOOLS_JDK) $(CONDITIONALSPECIALCASINGTEMP) \
+        $(SPECIALCASING) $(DERIVEDCOREPROPS) $(PROPLIST)
+	$(call LogInfo, Generating $@)
+	$(call MakeTargetDir)
+	$(TOOL_GENERATESPECIALCASING) \
+	    $(CONDITIONALSPECIALCASINGTEMP) \
+	    $(SPECIALCASING) \
+	    $(GENSRC_CONDITIONALSPECIALCASING_SPECIALCASING_TMP)
+	$(TOOL_GENERATEEXTRAPROPERTIES) \
+	    $(GENSRC_CONDITIONALSPECIALCASING_SPECIALCASING_TMP) \
+	    $(DERIVEDCOREPROPS) \
+	    $(GENSRC_CONDITIONALSPECIALCASING_PROPS_TMP) \
+	    $(FINALSIGMAPARAMS)
+	$(TOOL_GENERATEEXTRAPROPERTIES) \
+	    $(GENSRC_CONDITIONALSPECIALCASING_PROPS_TMP) \
+	    $(PROPLIST) \
+	    $(GENSRC_CONDITIONALSPECIALCASING) \
+	    $(SOFTDOTTEDPARAMS)
+	$(RM) $(GENSRC_CONDITIONALSPECIALCASING_SPECIALCASING_TMP)
+	$(RM) $(GENSRC_CONDITIONALSPECIALCASING_PROPS_TMP)
+
+TARGETS += $(GENSRC_CONDITIONALSPECIALCASING)
 
 endif # include guard
 include MakeIncludeEnd.gmk

make/modules/java.management/Lib.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
@@ -36,7 +36,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     OPTIMIZATION := HIGH, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat, \
-    LIBS_windows := advapi32.lib psapi.lib, \
+    LIBS_windows := advapi32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBMANAGEMENT)

make/modules/jdk.attach/Lib.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
@@ -31,20 +31,12 @@ include LibCommon.gmk
 ## Build libattach
 ################################################################################
 
-ifeq ($(call isTargetOs, windows), true)
-  # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
-  # a binary that is compatible with windows versions older than 7/2008R2.
-  # See MSDN documentation for GetProcessMemoryInfo for more information.
-  LIBATTACH_CFLAGS := -DPSAPI_VERSION=1
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
     NAME := attach, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := -Gy, \
     JDK_LIBS := java.base:libjava, \
-    LIBS_windows := advapi32.lib psapi.lib, \
+    LIBS_windows := advapi32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBATTACH)

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

@@ -60,6 +60,9 @@ LIBSAPROC_EXCLUDE_FILES :=
 ifneq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, x86_64 aarch64)), true)
   LIBSAPROC_EXCLUDE_FILES := DwarfParser.cpp dwarf.cpp
 endif
+ifneq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true)
+  LIBSAPROC_EXCLUDE_FILES += AARCH64DwarfParser.cpp aarch64Dwarf.cpp LinuxAARCH64DebuggerLocal.cpp
+endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSAPROC, \
     NAME := saproc, \

make/modules/jdk.management/Lib.gmk

@@ -31,21 +31,13 @@ include LibCommon.gmk
 ## Build libmanagement_ext
 ################################################################################
 
-ifeq ($(call isTargetOs, windows), true)
-  # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
-  # a binary that is compatible with windows versions older than 7/2008R2.
-  # See MSDN documentation for GetProcessMemoryInfo for more information.
-  LIBMANAGEMENT_EXT_CFLAGS := -DPSAPI_VERSION=1
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     NAME := management_ext, \
     OPTIMIZATION := HIGH, \
     DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \
-    CFLAGS := $(LIBMANAGEMENT_EXT_CFLAGS), \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat, \
-    LIBS_windows := advapi32.lib psapi.lib, \
+    LIBS_windows := advapi32.lib, \
 ))
 
 TARGETS += $(BUILD_LIBMANAGEMENT_EXT)

src/hotspot/cpu/aarch64/aarch64.ad

@@ -8228,7 +8228,7 @@ instruct encodeKlass_not_null(iRegNNoSp dst, iRegP src) %{
   ins_encode %{
     Register src_reg = as_Register($src$$reg);
     Register dst_reg = as_Register($dst$$reg);
-    __ encode_klass_not_null(dst_reg, src_reg);
+    __ encode_klass_not_null(dst_reg, src_reg, rscratch1);
   %}
 
    ins_pipe(ialu_reg);
@@ -8243,11 +8243,7 @@ instruct decodeKlass_not_null(iRegPNoSp dst, iRegN src) %{
   ins_encode %{
     Register src_reg = as_Register($src$$reg);
     Register dst_reg = as_Register($dst$$reg);
-    if (dst_reg != src_reg) {
-      __ decode_klass_not_null(dst_reg, src_reg);
-    } else {
-      __ decode_klass_not_null(dst_reg);
-    }
+    __ decode_klass_not_null(dst_reg, src_reg, rscratch1);
   %}
 
    ins_pipe(ialu_reg);