svm: adopt "JDK-8348986: Improve coverage of enhanced exception messages"

Author: zapster

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JNIRegistrationUtil.java

@@ -38,6 +38,7 @@
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 import org.graalvm.nativeimage.hosted.Feature.FeatureAccess;
 import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
+import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
 import com.oracle.svm.core.util.ConcurrentIdentityHashMap;
@@ -109,6 +110,9 @@ protected static void registerForThrowNew(FeatureAccess access, String... except
         for (String exceptionClassName : exceptionClassNames) {
             RuntimeJNIAccess.register(clazz(access, exceptionClassName));
             RuntimeJNIAccess.register(constructor(access, exceptionClassName, String.class));
+
+            RuntimeReflection.register(clazz(access, exceptionClassName));
+            RuntimeReflection.register(constructor(access, exceptionClassName, String.class));
         }
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_Exceptions.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025, 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
+ * 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 com.oracle.svm.core.jdk;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(jdk.internal.util.Exceptions.class)
+@SuppressWarnings({"unused", "FieldCanBeLocal"})
+final class Target_jdk_internal_util_Exceptions {
+
+    /**
+     * Setup is eagerly called in {@code com.oracle.svm.hosted.jdk.JDKInitializationFeature}.
+     */
+    @Substitute
+    public static void setup() {
+        // do nothing
+    }
+}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKInitializationFeature.java

@@ -276,6 +276,11 @@ public void afterRegistration(AfterRegistrationAccess access) {
 
         rci.initializeAtRunTime("jdk.internal.markdown.MarkdownTransformer", "Contains a static field with a DocTreeScanner which is initialized at run time");
 
+        /* Ensure "enhanced exception messages" are initialized (JDK 25+26, JDK-8348986). */
+        var exceptionsClass = ReflectionUtil.lookupClass("jdk.internal.util.Exceptions");
+        var exceptionsSetup = ReflectionUtil.lookupMethod(exceptionsClass, "setup");
+        ReflectionUtil.invokeMethod(exceptionsSetup, null);
+
         /*
          * The local class Holder in FallbackLinker#getInstance fails the build time initialization
          * starting JDK 22. There is no way to obtain a list of local classes using reflection. They

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java

@@ -120,6 +120,9 @@ static void registerInitInetAddressIDs(DuringAnalysisAccess a) {
         RuntimeJNIAccess.register(constructor(a, "java.net.Inet6Address"));
         RuntimeJNIAccess.register(fields(a, "java.net.Inet6Address", "holder6"));
         RuntimeJNIAccess.register(fields(a, "java.net.Inet6Address$Inet6AddressHolder", "ipaddress", "scope_id", "scope_id_set", "scope_ifname"));
+
+        /* Used by getEnhancedExceptionsAllowed() in net_util.c (JDK-8348986) */
+        RuntimeJNIAccess.register(fields(a, "jdk.internal.util.Exceptions", "enhancedNonSocketExceptionText"));
     }
 
     private static void registerNetworkInterfaceInit(DuringAnalysisAccess a) {