Merge pull request #2224 from SAP/pr-jdk-27+19

Merge to tag jdk-27+19

Author: RealCLanger

.gitignore

@@ -24,8 +24,6 @@ NashornProfile.txt
 /.gdbinit
 /.lldbinit
 **/core.[0-9]*
-*.rej
-*.orig
 test/benchmarks/**/target
 /src/hotspot/CMakeLists.txt
 /src/hotspot/compile_commands.json

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -93,19 +93,16 @@ JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
 JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
-# -XDaccessInternalAPI is a temporary workaround, see 8373909
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary \
-    -XDaccessInternalAPI
+    --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive \
-    -XDaccessInternalAPI
+    -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)

make/RunTests.gmk

@@ -1020,6 +1020,9 @@ define SetupRunJtregTestBody
         VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
     $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
     $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
+        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-AotJdk.txt) \
+    ))
   endif
 
 

make/hotspot/lib/CompileGtest.gmk

@@ -45,6 +45,15 @@ else
   GTEST_COPY_DEBUG_SYMBOLS := false
 endif
 
+GTEST_LIBJVM_CFLAGS := $(JVM_CFLAGS)
+# Decoder does not work with debuginfo of the gtest libjvm when sections are used,
+# so we get wrong file names. That's why we filter out the section flags.
+ifeq ($(ENABLE_LINKTIME_GC), true)
+  ifeq ($(TOOLCHAIN_TYPE), gcc)
+    GTEST_LIBJVM_CFLAGS := $(filter-out -ffunction-sections -fdata-sections, $(JVM_CFLAGS))
+  endif
+endif
+
 ################################################################################
 ## Build libgtest
 ################################################################################
@@ -99,7 +108,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
     EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
     EXTRA_OBJECT_FILES := $(BUILD_LIBJVM_ALL_OBJS), \
     DEFAULT_CFLAGS := false, \
-    CFLAGS := $(JVM_CFLAGS) \
+    CFLAGS := $(GTEST_LIBJVM_CFLAGS) \
         -DHOTSPOT_GTEST \
         -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \

make/hotspot/lib/CompileJvm.gmk

@@ -209,6 +209,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     DISABLED_WARNINGS_gcc_jvmtiTagMap.cpp := stringop-overflow, \
     DISABLED_WARNINGS_gcc_macroAssembler_ppc_sha.cpp := unused-const-variable, \
     DISABLED_WARNINGS_gcc_postaloc.cpp := address, \
+    DISABLED_WARNINGS_gcc_safepointMechanism.cpp := stringop-overflow, \
+    DISABLED_WARNINGS_gcc_shenandoahGenerationalHeap.cpp := stringop-overflow, \
     DISABLED_WARNINGS_gcc_shenandoahLock.cpp := stringop-overflow, \
     DISABLED_WARNINGS_gcc_stubGenerator_s390.cpp := unused-const-variable, \
     DISABLED_WARNINGS_gcc_synchronizer.cpp := stringop-overflow, \

make/jdk/src/classes/build/tools/taglet/JSpec.java

@@ -25,13 +25,13 @@
 
 package build.tools.taglet;
 
+import java.net.URI;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.lang.reflect.Field;
 
 import javax.lang.model.element.Element;
 
@@ -141,6 +141,11 @@ public String getName() {
 
     @Override
     public String toString(List<? extends DocTree> tags, Element elem) {
+        throw new UnsupportedOperationException();
+    }
+
+    // @Override - requires JDK-8373922 in build JDK
+    public String toString(List<? extends DocTree> tags, Element elem, URI docRoot) {
 
         if (tags.isEmpty())
             return "";
@@ -177,7 +182,7 @@ public String toString(List<? extends DocTree> tags, Element elem) {
                 String preview = m.group("preview"); // null if no preview feature
                 String chapter = m.group("chapter");
                 String section = m.group("section");
-                String rootParent = currentPath().replaceAll("[^/]+", "..");
+                String rootParent = docRoot.resolve("..").toString();
 
                 String url = preview == null ?
                         String.format("%1$s/specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
@@ -230,23 +235,6 @@ public String toString(List<? extends DocTree> tags, Element elem) {
         return sb.toString();
     }
 
-    private static ThreadLocal<String> CURRENT_PATH = null;
-
-    private String currentPath() {
-        if (CURRENT_PATH == null) {
-            try {
-                Field f = Class.forName("jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter")
-                               .getField("CURRENT_PATH");
-                @SuppressWarnings("unchecked")
-                ThreadLocal<String> tl = (ThreadLocal<String>) f.get(null);
-                CURRENT_PATH = tl;
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException("Cannot determine current path", e);
-            }
-        }
-        return CURRENT_PATH.get();
-    }
-
     private String expand(List<? extends DocTree> trees) {
         return (new SimpleDocTreeVisitor<StringBuilder, StringBuilder>() {
             public StringBuilder defaultAction(DocTree tree, StringBuilder sb) {

make/jdk/src/classes/build/tools/taglet/SealedGraph.java

@@ -32,7 +32,9 @@
 
 import javax.lang.model.element.*;
 import javax.lang.model.type.DeclaredType;
+import javax.lang.model.util.Elements;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -78,16 +80,27 @@ public void init(DocletEnvironment env, Doclet doclet) {
 
     @Override
     public String toString(List<? extends DocTree> tags, Element element) {
+        throw new UnsupportedOperationException();
+    }
+
+    // @Override - requires JDK-8373922 in build JDK
+    public String toString(List<? extends DocTree> tags, Element element, URI docRoot) {
         if (sealedDotOutputDir == null || sealedDotOutputDir.isEmpty()) {
             return "";
         }
         if (docletEnvironment == null || !(element instanceof TypeElement typeElement)) {
             return "";
         }
 
-        ModuleElement module = docletEnvironment.getElementUtils().getModuleOf(element);
+        Elements util = docletEnvironment.getElementUtils();
+        ModuleElement module = util.getModuleOf(element);
+
+        // '.' in .DOT file name is converted to '/' in .SVG path, so we use '-' as separator for nested classes.
+        // module_package.subpackage.Outer-Inner.dot => module/package/subpackage/Outer-Inner-sealed-graph.svg
         Path dotFile = Path.of(sealedDotOutputDir,
-                module.getQualifiedName() + "_" + typeElement.getQualifiedName() + ".dot");
+                module.getQualifiedName() + "_"
+                        + util.getPackageOf(element).getQualifiedName() + "."
+                        + packagelessCanonicalName(typeElement).replace(".", "-") + ".dot");
 
         Set<String> exports = module.getDirectives().stream()
                 .filter(ModuleElement.ExportsDirective.class::isInstance)
@@ -99,16 +112,16 @@ public String toString(List<? extends DocTree> tags, Element element) {
                 .map(Objects::toString)
                 .collect(Collectors.toUnmodifiableSet());
 
-        String dotContent = new Renderer().graph(typeElement, exports);
+        String dotContent = new Renderer().graph(typeElement, exports, docRoot);
 
         try  {
             Files.writeString(dotFile, dotContent, WRITE, CREATE, TRUNCATE_EXISTING);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
 
-        String simpleTypeName = packagelessCanonicalName(typeElement).replace('.', '/');
-        String imageFile = simpleTypeName + "-sealed-graph.svg";
+        String simpleTypeName = packagelessCanonicalName(typeElement);
+        String imageFile = simpleTypeName.replace(".", "-") + "-sealed-graph.svg";
         int thumbnailHeight = 100; // also appears in the stylesheet
         String hoverImage = "<span>"
             + getImage(simpleTypeName, imageFile, -1, true)
@@ -137,12 +150,12 @@ private String getImage(String typeName, String file, int height, boolean useBor
     private final class Renderer {
 
         // Generates a graph in DOT format
-        String graph(TypeElement rootClass, Set<String> exports) {
+        String graph(TypeElement rootClass, Set<String> exports, URI pathToRoot) {
             if (!isInPublicApi(rootClass, exports)) {
                 // Alternatively we can return "" for the graph since there is no single root to render
                 throw new IllegalArgumentException("Root not in public API: " + rootClass.getQualifiedName());
             }
-            final State state = new State(rootClass);
+            final State state = new State(pathToRoot);
             traverse(state, rootClass, exports);
             return state.render();
         }
@@ -168,7 +181,7 @@ private final class State {
             private static final String TOOLTIP = "tooltip";
             private static final String LINK = "href";
 
-            private final TypeElement rootNode;
+            private final URI pathToRoot;
 
             private final StringBuilder builder;
 
@@ -193,8 +206,8 @@ public String valueString() {
                 }
             }
 
-            public State(TypeElement rootNode) {
-                this.rootNode = rootNode;
+            public State(URI pathToRoot) {
+                this.pathToRoot = pathToRoot;
                 nodeStyleMap = new LinkedHashMap<>();
                 builder = new StringBuilder()
                         .append("digraph G {")
@@ -217,24 +230,15 @@ public void addNode(TypeElement node) {
                 var styles = nodeStyleMap.computeIfAbsent(id(node), n -> new LinkedHashMap<>());
                 styles.put(LABEL, new StyleItem.PlainString(node.getSimpleName().toString()));
                 styles.put(TOOLTIP, new StyleItem.PlainString(node.getQualifiedName().toString()));
-                styles.put(LINK, new StyleItem.PlainString(relativeLink(node)));
+                styles.put(LINK, new StyleItem.PlainString(pathToRoot.resolve(relativeLink(node)).toString()));
             }
 
-            // A permitted class must be in the same package or in the same module.
-            // This implies the module is always the same.
             private String relativeLink(TypeElement node) {
                 var util = SealedGraph.this.docletEnvironment.getElementUtils();
-                var nodePackage = util.getPackageOf(node);
-                // Note: SVG files for nested types use the simple names of containing types as parent directories.
-                // We therefore need to convert all dots in the qualified name to "../" below.
-                var backNavigator = rootNode.getQualifiedName().toString().chars()
-                        .filter(c -> c == '.')
-                        .mapToObj(c -> "../")
-                        .collect(joining());
-                var forwardNavigator = nodePackage.getQualifiedName().toString()
-                        .replace(".", "/");
-
-                return backNavigator + forwardNavigator + "/" + packagelessCanonicalName(node) + ".html";
+                var path = util.getModuleOf(node).getQualifiedName().toString() + "/"
+                        + util.getPackageOf(node).getQualifiedName().toString().replace(".", "/");
+
+                return path + "/" + packagelessCanonicalName(node) + ".html";
             }
 
             public void addEdge(TypeElement node, TypeElement subNode) {
@@ -286,14 +290,6 @@ private String id(TypeElement node) {
             private String quotedId(TypeElement node) {
                 return "\"" + id(node) + "\"";
             }
-
-            private String simpleName(String name) {
-                int lastDot = name.lastIndexOf('.');
-                return lastDot < 0
-                        ? name
-                        : name.substring(lastDot);
-            }
-
         }
 
         private static List<TypeElement> permittedSubclasses(TypeElement node, Set<String> exports) {

make/jdk/src/classes/build/tools/taglet/ToolGuide.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -25,13 +25,13 @@
 
 package build.tools.taglet;
 
+import java.net.URI;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.lang.reflect.Field;
 
 import javax.lang.model.element.Element;
 
@@ -91,6 +91,11 @@ public String getName() {
 
     @Override
     public String toString(List<? extends DocTree> tags, Element elem) {
+        throw new UnsupportedOperationException();
+    }
+
+    // @Override - requires JDK-8373922 in build JDK
+    public String toString(List<? extends DocTree> tags, Element elem, URI docRoot) {
 
         if (tags.isEmpty())
             return "";
@@ -118,7 +123,7 @@ public String toString(List<? extends DocTree> tags, Element elem) {
                 if (label.isEmpty()) {
                     label = name;
                 }
-                String rootParent = currentPath().replaceAll("[^/]+", "..");
+                String rootParent = docRoot.resolve("..").toString();
 
                 String url = String.format("%s/%s/%s.html",
                         rootParent, BASE_URL, name);
@@ -141,22 +146,4 @@ public String toString(List<? extends DocTree> tags, Element elem) {
 
         return sb.toString();
     }
-
-    private static ThreadLocal<String> CURRENT_PATH = null;
-
-    private String currentPath() {
-        if (CURRENT_PATH == null) {
-            try {
-                Field f = Class.forName("jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter")
-                               .getField("CURRENT_PATH");
-                @SuppressWarnings("unchecked")
-                ThreadLocal<String> tl = (ThreadLocal<String>) f.get(null);
-                CURRENT_PATH = tl;
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException("Cannot determine current path", e);
-            }
-        }
-        return CURRENT_PATH.get();
-    }
-
 }

make/modules/java.desktop/lib/ClientLibraries.gmk

@@ -395,6 +395,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
         AccelGlyphCache.c, \
     CFLAGS := $(LIBFONTMANAGER_CFLAGS), \
     CXXFLAGS := $(LIBFONTMANAGER_CFLAGS), \
+    CXXFLAGS_gcc := -fno-rtti -fno-exceptions, \
+    CXXFLAGS_clang := -fno-rtti -fno-exceptions, \
     OPTIMIZATION := HIGHEST, \
     CFLAGS_windows = -DCC_NOEX, \
     EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \

src/hotspot/cpu/aarch64/aarch64.ad

@@ -7708,10 +7708,11 @@ instruct bytes_reverse_unsigned_short(iRegINoSp dst, iRegIorL2I src) %{
   match(Set dst (ReverseBytesUS src));
 
   ins_cost(INSN_COST);
-  format %{ "rev16w  $dst, $src" %}
+  format %{ "rev16w $dst, $src\t# $dst -> unsigned short" %}
 
   ins_encode %{
     __ rev16w(as_Register($dst$$reg), as_Register($src$$reg));
+    __ narrow_subword_type(as_Register($dst$$reg), T_CHAR);
   %}
 
   ins_pipe(ialu_reg);