Merge graalvm-community-jdk21u into mandrel/23.1

Author: jerboaa

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java

@@ -352,6 +352,7 @@ protected BlockT merge(HIRBlock merge, List<BlockT> states) {
     @Override
     @SuppressWarnings("try")
     protected final List<BlockT> processLoop(Loop<HIRBlock> loop, BlockT initialState) {
+        final StructuredGraph graph = loop.getHeader().getBeginNode().graph();
         if (initialState.isDead()) {
             ArrayList<BlockT> states = new ArrayList<>();
             for (int i = 0; i < loop.getLoopExits().size(); i++) {
@@ -422,6 +423,8 @@ protected final List<BlockT> processLoop(Loop<HIRBlock> loop, BlockT initialStat
                 loopLocationKillCacheCopy.putAll(loopLocationKillCache);
             }
         }
+
+        boolean tooManyIterationsSeen = false;
         while (true) {
             try {
                 BlockT loopEntryState = initialStateRemovedKilledLocations;
@@ -511,7 +514,18 @@ protected final List<BlockT> processLoop(Loop<HIRBlock> loop, BlockT initialStat
                 currentMode = EffectsClosureMode.MATERIALIZE_ALL;
                 continue;
             }
-            throw new GraalError("too many iterations at %s", loop);
+            if (!tooManyIterationsSeen) {
+                tooManyIterationsSeen = true;
+                /*
+                 * The first time we see that we did too many iterations we materialize everything
+                 * before the loop and see if that fixes our problems.
+                 */
+                graph.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, graph, "Too many loop iterations for %s trying to materialize everything before loop and redo loop nest", loop);
+                currentMode = EffectsClosureMode.MATERIALIZE_ALL;
+                continue;
+            } else {
+                throw new GraalError("too many iterations at %s", loop);
+            }
         }
     }
 

docs/reference-manual/native-image/JFR.md

@@ -89,7 +89,7 @@ You can configure the logging for the JFR system with a separate flag `-XX:Fligh
 The usage is: `-XX:FlightRecorderLogging=[tag1[+tag2...][*][=level][,...]]`. 
 For example:
 ```shell
--XX:FlightRecorderLogging=jfr,system=debug
+-XX:FlightRecorderLogging=jfr+system=debug
 -XX:FlightRecorderLogging=all=trace
 -XX:FlightRecorderLogging=jfr*=error
 ```

sdk/src/org.graalvm.home.test/src/org/graalvm/home/test/VersionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -48,10 +48,12 @@
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import org.graalvm.home.Version;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class VersionTest {
@@ -208,6 +210,40 @@ public void testFormat() {
         assertFormat("%%[R%d.%%d]", "23.0", "%[R23.%d]");
     }
 
+    @Test
+    public void testGetComponents() {
+        Version version = Version.create(23, 1, 4);
+        try {
+            version.getComponent(-1);
+            Assert.fail("Should not reach here");
+        } catch (IllegalArgumentException illegalArgument) {
+            // expected
+        }
+        assertVersionComponents(new int[]{23, 1, 4, 0}, version);
+        version = Version.create(23, 1);
+        assertVersionComponents(new int[]{23, 1, 0, 0}, version);
+        version = Version.create(23);
+        assertVersionComponents(new int[]{23, 0, 0, 0}, version);
+        version = Version.create(23, 0, 0);
+        assertVersionComponents(new int[]{23, 0, 0, 0}, version);
+        version = Version.parse("23.1.4");
+        assertVersionComponents(new int[]{23, 1, 4, 0}, version);
+        version = Version.parse("23.1.4-snapshot");
+        assertVersionComponents(new int[]{23, 1, 4, 0}, version);
+        version = Version.parse("23.1.4-dev");
+        assertVersionComponents(new int[]{23, 1, 4, 0}, version);
+        version = Version.parse("dev");
+        assertVersionComponents(new int[]{0, 0, 0, 0}, version);
+        version = Version.parse("snapshot");
+        assertVersionComponents(new int[]{0, 0, 0, 0}, version);
+    }
+
+    private static void assertVersionComponents(int[] expectedComponents, Version version) {
+        for (int i = 0; i < expectedComponents.length; i++) {
+            assertEquals("Expected " + Arrays.toString(expectedComponents) + "components in " + version, expectedComponents[i], version.getComponent(i));
+        }
+    }
+
     private static void assertFormat(String format, String version, String expected) {
         Version v = Version.parse(version);
         String result = v.format(format);

sdk/src/org.graalvm.home/snapshot.sigtest

@@ -36,6 +36,7 @@ meth public boolean equals(java.lang.Object)
 meth public boolean isRelease()
 meth public boolean isSnapshot()
 meth public int compareTo(org.graalvm.home.Version)
+meth public int getComponent(int)
 meth public int hashCode()
 meth public java.lang.String format(java.lang.String)
 meth public java.lang.String toString()

sdk/src/org.graalvm.home/src/org/graalvm/home/Version.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -338,6 +338,32 @@ public String format(String format) {
         return String.format(processFormat(format), args);
     }
 
+    /**
+     * Retrieves the numeric value of the version component at the specified index.
+     * <p>
+     * Version components are indexed as follows:
+     * <ul>
+     * <li>{@code componentIndex = 0} represents the major version</li>
+     * <li>{@code componentIndex = 1} represents the minor version</li>
+     * <li>{@code componentIndex = 2} represents the update version</li>
+     * </ul>
+     * If the specified {@code componentIndex} exceeds the number of available components, the
+     * method returns {@code 0}. For example, a version {@code 23.1} will return {@code 0} for
+     * {@code componentIndex = 2}.
+     * </p>
+     *
+     * @param componentIndex the index of the version component to retrieve; must be non-negative
+     * @throws IllegalArgumentException if {@code componentIndex} is negative
+     * @since 24.2
+     * @see Version#create(int...)
+     */
+    public int getComponent(int componentIndex) {
+        if (componentIndex < 0) {
+            throw new IllegalArgumentException("componentIndex must be non-negative: " + componentIndex);
+        }
+        return componentIndex < versions.length ? versions[componentIndex] : 0;
+    }
+
     /**
      * Parses a GraalVM version from its String raw format. Throws {@link IllegalArgumentException}
      * if the passed string is not a valid GraalVM version.

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java

@@ -210,7 +210,7 @@ private static boolean forName(JNIEnvironment jni, JNIObjectHandle thread, Break
         JNIObjectHandle name = getObjectArgument(thread, 0);
         String className = fromJniString(jni, name);
         if (className == null) {
-            return false; /* No point in tracing this. */
+            return true; /* No point in tracing this. */
         }
         traceReflectBreakpoint(jni, bp.clazz, nullHandle(), callerClass, bp.specification.methodName, null, state.getFullStackTraceOrNull(), className);
         return true;
@@ -573,13 +573,27 @@ private static boolean newArrayInstance0(JNIEnvironment jni, Breakpoint bp, JNIV
         return true;
     }
 
+    private static boolean handleResourceRegistration(JNIEnvironment env, JNIObjectHandle clazz, JNIObjectHandle callerClass, String function, JNIMethodId[] stackTrace, String resourceName,
+                    String moduleName) {
+        if (resourceName == null) {
+            return true; /* No point in tracing this: resource path is null */
+        }
+
+        if (moduleName == null) {
+            traceReflectBreakpoint(env, clazz, nullHandle(), callerClass, function, true, stackTrace, resourceName);
+        } else {
+            traceReflectBreakpoint(env, clazz, nullHandle(), callerClass, function, true, stackTrace, moduleName, resourceName);
+        }
+
+        return true;
+    }
+
     private static boolean findResource(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
         JNIObjectHandle callerClass = state.getDirectCallerClass();
         JNIObjectHandle module = getObjectArgument(thread, 1);
         JNIObjectHandle name = getObjectArgument(thread, 2);
-        traceReflectBreakpoint(jni, nullHandle(), nullHandle(), callerClass, bp.specification.methodName, true, state.getFullStackTraceOrNull(),
-                        fromJniString(jni, module), fromJniString(jni, name));
-        return true;
+
+        return handleResourceRegistration(jni, nullHandle(), callerClass, bp.specification.methodName, state.getFullStackTraceOrNull(), fromJniString(jni, name), fromJniString(jni, module));
     }
 
     private static boolean getResource(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
@@ -601,8 +615,8 @@ private static boolean handleGetResources(JNIEnvironment jni, JNIObjectHandle th
                 selfClazz = nullHandle();
             }
         }
-        traceReflectBreakpoint(jni, selfClazz, nullHandle(), callerClass, bp.specification.methodName, true, state.getFullStackTraceOrNull(), fromJniString(jni, name));
-        return true;
+
+        return handleResourceRegistration(jni, selfClazz, callerClass, bp.specification.methodName, state.getFullStackTraceOrNull(), fromJniString(jni, name), null);
     }
 
     private static boolean getSystemResource(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
@@ -615,9 +629,9 @@ private static boolean getSystemResources(JNIEnvironment jni, JNIObjectHandle th
 
     private static boolean handleGetSystemResources(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
         JNIObjectHandle callerClass = state.getDirectCallerClass();
-        JNIObjectHandle name = getReceiver(thread);
-        traceReflectBreakpoint(jni, nullHandle(), nullHandle(), callerClass, bp.specification.methodName, true, state.getFullStackTraceOrNull(), fromJniString(jni, name));
-        return true;
+        JNIObjectHandle name = getObjectArgument(thread, 0);
+
+        return handleResourceRegistration(jni, nullHandle(), callerClass, bp.specification.methodName, state.getFullStackTraceOrNull(), fromJniString(jni, name), null);
     }
 
     private static boolean newProxyInstance(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java

@@ -106,6 +106,7 @@ public void processEntry(EconomicMap<String, ?> entry, ConfigurationSet configur
                     configuration.getOrCreateType(condition, type);
                 }
             }
+            return;
         }
         String clazz = (String) entry.get("class");
         if (advisor.shouldIgnore(lazyValue(clazz), lazyValue(callerClass))) {

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEventSupport.java

@@ -75,6 +75,7 @@ public void emitGarbageCollectionEvent(UnsignedWord gcEpoch, GCCause cause, long
             JfrNativeEventWriter.beginSmallEvent(data, JfrEvent.GarbageCollection);
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putLong(data, duration);
+            JfrNativeEventWriter.putEventThread(data);
             JfrNativeEventWriter.putLong(data, gcEpoch.rawValue());
             JfrNativeEventWriter.putLong(data, gcName.getId());
             JfrNativeEventWriter.putLong(data, cause.getId());

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/LibGraalCollectionPolicy.java

@@ -63,6 +63,11 @@ public static final class Options {
     private UnsignedWord sizeBefore = WordFactory.zero();
     private GCCause lastGCCause = null;
 
+    @Override
+    public String getName() {
+        return "libgraal";
+    }
+
     /**
      * The hinted GC will be triggered only if the used bytes in eden space is greater than
      * {@link Options#ExpectedEdenSize}, or if the ratio of used bytes to total allocated bytes of

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java

@@ -51,6 +51,7 @@
 import org.graalvm.nativeimage.c.struct.RawStructure;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.nativeimage.c.type.CCharPointer;
+import org.graalvm.nativeimage.impl.ImageSingletonsSupport;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.UnsignedWord;
@@ -170,7 +171,7 @@ public static void printObjectInfo(Log log, Object obj) {
             log.string(obj.getClass().getName());
 
             if (obj instanceof String s) {
-                log.string(": ").string(s, 60);
+                log.string(": \"").string(s, 60).string("\"");
             } else {
                 int layoutEncoding = DynamicHub.fromClass(obj.getClass()).getLayoutEncoding();
 
@@ -1282,13 +1283,13 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
 
                 /*
                  * Copy the value to a field in the image heap so that it is safe to access. During
-                 * image build, it can happen that the singleton does not exist yet. In that case,
-                 * the value will be copied to the image heap when executing the constructor of the
-                 * singleton. This is a bit cumbersome but necessary because we can't use a static
-                 * field. We also need to mark the option as used at run-time (see feature) as the
-                 * static analysis would otherwise remove the option from the image.
+                 * the image build, it can happen that the singleton does not exist yet. In that
+                 * case, the value will be copied to the image heap when executing the constructor
+                 * of the singleton. This is a bit cumbersome but necessary because we can't use a
+                 * static field. We also need to mark the option as used at run-time (see feature)
+                 * as the static analysis would otherwise remove the option from the image.
                  */
-                if (ImageSingletons.contains(Options.class)) {
+                if (wasConstructorExecuted()) {
                     Options.singleton().loopOnFatalError = newValue;
                 }
             }
@@ -1301,7 +1302,7 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
                 super.onValueUpdate(values, oldValue, newValue);
 
                 /* See comment above. */
-                if (ImageSingletons.contains(Options.class)) {
+                if (wasConstructorExecuted()) {
                     Options.singleton().implicitExceptionWithoutStacktraceIsFatal = newValue;
                 }
             }
@@ -1329,5 +1330,9 @@ public static boolean shouldLoopOnFatalError() {
         public static boolean implicitExceptionWithoutStacktraceIsFatal() {
             return singleton().implicitExceptionWithoutStacktraceIsFatal;
         }
+
+        private static boolean wasConstructorExecuted() {
+            return (!SubstrateUtil.HOSTED || ImageSingletonsSupport.isInstalled()) && ImageSingletons.contains(Options.class);
+        }
     }
 }