Merge pull request #55 from zakkak/2025-03-13-backports-23.1.5-batch8

Author: zakkak

common.json

@@ -19,12 +19,12 @@
     "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.8+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
     "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ee-21.0.5+7-jvmci-23.1-b46", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ee-21.0.5+7-jvmci-23.1-b46-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.5+7-jvmci-23.1-b46-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21.0.5+7-jvmci-23.1-b46", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.5+7-jvmci-23.1-b46-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.5+7-jvmci-23.1-b46-sulong", "platformspecific": true },
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-sulong", "platformspecific": true },
 
     "oraclejdk22":        {"name": "jpg-jdk",   "version": "22",      "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
   },

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubprocessTest.java

@@ -24,12 +24,14 @@
  */
 package org.graalvm.compiler.core.test;
 
+import static org.graalvm.compiler.test.SubprocessUtil.getProcessCommandLine;
 import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine;
 import static org.graalvm.compiler.test.SubprocessUtil.java;
 import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -38,6 +40,23 @@
 import org.junit.Assume;
 import org.junit.Before;
 
+/**
+ * Utility class for executing Graal compiler tests in a subprocess. This can be useful for tests
+ * that need special VM arguments or that produce textual output or a special process termination
+ * status that need to be analyzed. The class to be executed may be the current class or any other
+ * unit test class.
+ * <p/>
+ * If the test class contains multiple {@code @Test} methods, they will all be executed in the
+ * subprocess, except when using one of the methods that take a {@code testSelector} argument. All
+ * methods in this class take a {@link Runnable} argument. If the test class is the same as the
+ * calling class, this runnable defines the operation to be executed in the subprocess. If the test
+ * class is not the same as the calling class, the runnable is irrelevant and can be a nop.
+ * <p/>
+ * The subprocess will inherit any {@code -JUnitVerbose} flag (typically set through
+ * {@code mx unittest --verbose}) from the parent process. If this flag is set, the standard output
+ * of the child process will be echoed to the standard output of the parent process. If the child
+ * process terminates with an error, its standard output will always be printed.
+ */
 public abstract class SubprocessTest extends GraalCompilerTest {
 
     @Before
@@ -54,16 +73,24 @@ public void checkJavaAgent() {
      *         {@link Subprocess} instance describing the process after its successful termination.
      */
     public SubprocessUtil.Subprocess launchSubprocess(Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, true, getClass(), runnable, args);
+        return launchSubprocess(null, true, getClass(), null, runnable, args);
     }
 
     public static SubprocessUtil.Subprocess launchSubprocess(Class<? extends GraalCompilerTest> testClass, Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, true, testClass, runnable, args);
+        return launchSubprocess(null, true, testClass, null, runnable, args);
+    }
+
+    public void launchSubprocess(String testSelector, Runnable runnable, String... args) throws InterruptedException, IOException {
+        launchSubprocess(null, true, getClass(), testSelector, runnable, args);
+    }
+
+    public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>> testPredicate, boolean expectNormalExit, Class<? extends GraalCompilerTest> testClass,
+                    Runnable runnable, String... args) throws InterruptedException, IOException {
+        return launchSubprocess(testPredicate, expectNormalExit, testClass, null, runnable, args);
     }
 
-    public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>> testPredicate, boolean expectNormalExit, Class<? extends GraalCompilerTest> testClass, Runnable runnable,
-                    String... args)
-                    throws InterruptedException, IOException {
+    public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>> testPredicate, boolean expectNormalExit, Class<? extends GraalCompilerTest> testClass, String testSelector,
+                    Runnable runnable, String... args) throws InterruptedException, IOException {
         String recursionPropName = testClass.getSimpleName() + ".Subprocess";
         if (Boolean.getBoolean(recursionPropName)) {
             runnable.run();
@@ -77,7 +104,18 @@ public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>>
             if (verbose) {
                 System.err.println(String.join(" ", vmArgs));
             }
-            SubprocessUtil.Subprocess proc = java(vmArgs, "com.oracle.mxtool.junit.MxJUnitWrapper", testClass.getName());
+            List<String> mainClassAndArgs = new LinkedList<>();
+            mainClassAndArgs.add("com.oracle.mxtool.junit.MxJUnitWrapper");
+            String testName = testClass.getName();
+            if (testSelector != null) {
+                testName += "#" + testSelector;
+            }
+            mainClassAndArgs.add(testName);
+            boolean junitVerbose = getProcessCommandLine().contains("-JUnitVerbose");
+            if (junitVerbose) {
+                mainClassAndArgs.add("-JUnitVerbose");
+            }
+            SubprocessUtil.Subprocess proc = java(vmArgs, mainClassAndArgs);
             if (testPredicate != null) {
                 assertTrue(testPredicate.test(proc.output), proc.toString() + " produced unexpected output:\n\n" + String.join("\n", proc.output));
             }
@@ -91,6 +129,13 @@ public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>>
             } else {
                 assertTrue(proc.exitCode != 0, proc.toString() + " produced normal exit code " + proc.exitCode + ", but expected abnormal exit.");
             }
+            if (junitVerbose) {
+                System.out.println("--- subprocess output:");
+                for (String line : proc.output) {
+                    System.out.println(line);
+                }
+                System.out.println("--- end subprocess output");
+            }
             return proc;
         }
     }

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyFoldableMethods.java

@@ -25,10 +25,12 @@
 package org.graalvm.compiler.core.test;
 
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.nodes.PluginReplacementNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
@@ -39,7 +41,9 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
- * Verifies that all {@link Fold} annotated methods have at least one caller.
+ * Verifies that all {@link Fold} annotated methods have at least one caller from non-generated
+ * code. Ideally, the class should verify that foldable methods are only called from snippets but
+ * that requires a more global analysis (i.e., to know whether a caller is used within a snippet).
  */
 public class VerifyFoldableMethods extends VerifyPhase<CoreProviders> {
 
@@ -48,32 +52,59 @@ public boolean checkContract() {
         return false;
     }
 
-    private final Map<ResolvedJavaMethod, Boolean> foldables = new ConcurrentHashMap<>();
-    ResolvedJavaType generatedInvocationPluginType;
+    /**
+     * Map from a foldable method to one of its callers. The absence of a caller is represented a
+     * foldable method mapping to itself.
+     */
+    private final Map<ResolvedJavaMethod, ResolvedJavaMethod> foldableCallers = new ConcurrentHashMap<>();
+
+    /*
+     * Super types or interfaces for generated classes. Calls from methods in these classes are
+     * ignored.
+     */
+    Set<ResolvedJavaType> generatedClassSupertypes;
+
+    /**
+     * Determines if {@code method} is in a generated class.
+     */
+    private boolean isGenerated(ResolvedJavaMethod method, CoreProviders context) {
+        if (generatedClassSupertypes == null) {
+            generatedClassSupertypes = Set.of(
+                            context.getMetaAccess().lookupJavaType(GeneratedInvocationPlugin.class),
+                            context.getMetaAccess().lookupJavaType(PluginReplacementNode.ReplacementFunction.class));
+        }
+        ResolvedJavaType declaringClass = method.getDeclaringClass();
+        for (ResolvedJavaType t : generatedClassSupertypes) {
+            if (t.isAssignableFrom(declaringClass)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
     @Override
     protected void verify(StructuredGraph graph, CoreProviders context) {
         ResolvedJavaMethod method = graph.method();
         if (method.getAnnotation(Fold.class) != null) {
-            foldables.putIfAbsent(method, false);
+            foldableCallers.putIfAbsent(method, method);
         } else {
-            if (generatedInvocationPluginType == null) {
-                generatedInvocationPluginType = context.getMetaAccess().lookupJavaType(GeneratedInvocationPlugin.class);
-            }
-            if (!generatedInvocationPluginType.isAssignableFrom(method.getDeclaringClass())) {
+            if (!isGenerated(method, context)) {
                 for (MethodCallTargetNode t : graph.getNodes(MethodCallTargetNode.TYPE)) {
                     ResolvedJavaMethod callee = t.targetMethod();
                     if (callee.getAnnotation(Fold.class) != null) {
-                        foldables.put(callee, true);
+                        foldableCallers.put(callee, method);
                     }
                 }
             }
         }
     }
 
     public void finish() {
-        String uncalled = foldables.entrySet().stream().filter(e -> e.getValue() == false).map(e -> e.getKey().format("%H.%n(%p)")).collect(Collectors.joining(System.lineSeparator() + "  "));
-        if (uncalled.length() != 0) {
+        String uncalled = foldableCallers.entrySet().stream()//
+                        .filter(e -> e.getValue() == e.getKey())//
+                        .map(e -> e.getKey().format("%H.%n(%p)"))//
+                        .collect(Collectors.joining(System.lineSeparator() + "  "));
+        if (!uncalled.isEmpty()) {
             throw new VerificationError(String.format("Methods annotated with @" + Fold.class.getSimpleName() + " appear to have no usages:%n  %s", uncalled));
         }
     }

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java

@@ -484,11 +484,6 @@ private static String markWordField(String simpleName) {
 
     public final int methodCompiledEntryOffset = getFieldOffset("Method::_from_compiled_entry", Integer.class, "address");
 
-    public final int invocationCounterOffset = getFieldOffset("MethodCounters::_invocation_counter", Integer.class, "InvocationCounter");
-    public final int backedgeCounterOffset = getFieldOffset("MethodCounters::_backedge_counter", Integer.class, "InvocationCounter");
-    public final int invocationCounterIncrement = getConstant("InvocationCounter::count_increment", Integer.class);
-    public final int invocationCounterShift = getConstant("InvocationCounter::count_shift", Integer.class);
-
     public final int compilationLevelFullOptimization = getConstant("CompLevel_full_optimization", Integer.class);
 
     public final int heapWordSize = getConstant("HeapWordSize", Integer.class);

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java

@@ -58,7 +58,6 @@
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaType;
 
 public final class HotSpotG1WriteBarrierSnippets extends G1WriteBarrierSnippets {
     public static final HotSpotForeignCallDescriptor G1WBPRECALL = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, KILLED_PRE_WRITE_BARRIER_STUB_LOCATIONS, "write_barrier_pre",
@@ -176,16 +175,6 @@ protected ForeignCallDescriptor printfCallDescriptor() {
         return Log.LOG_PRINTF;
     }
 
-    @Override
-    protected ResolvedJavaType referenceType() {
-        return HotSpotReplacementsUtil.referenceType(INJECTED_METAACCESS);
-    }
-
-    @Override
-    protected long referentOffset() {
-        return HotSpotReplacementsUtil.referentOffset(INJECTED_METAACCESS);
-    }
-
     public static class Templates extends AbstractTemplates {
         private final SnippetInfo g1PreWriteBarrier;
         private final SnippetInfo g1ReferentReadBarrier;

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java

@@ -383,26 +383,6 @@ public static int allocatePrefetchStepSize(@InjectedParameter GraalHotSpotVMConf
         return config.allocatePrefetchStepSize;
     }
 
-    @Fold
-    public static int invocationCounterIncrement(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.invocationCounterIncrement;
-    }
-
-    @Fold
-    public static int invocationCounterOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.invocationCounterOffset;
-    }
-
-    @Fold
-    public static int backedgeCounterOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.backedgeCounterOffset;
-    }
-
-    @Fold
-    public static int invocationCounterShift(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.invocationCounterShift;
-    }
-
     @NodeIntrinsic(value = KlassLayoutHelperNode.class)
     public static native int readLayoutHelper(KlassPointer object);
 
@@ -833,11 +813,6 @@ static Word readInstanceKlassInitThread(KlassPointer hub) {
 
     public static final LocationIdentity KLASS_MODIFIER_FLAGS_LOCATION = NamedLocationIdentity.immutable("Klass::_modifier_flags");
 
-    @Fold
-    public static int klassModifierFlagsOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.klassModifierFlagsOffset;
-    }
-
     public static final LocationIdentity CLASS_KLASS_LOCATION = new HotSpotOptimizingLocationIdentity("Class._klass") {
         @Override
         public ValueNode canonicalizeRead(ValueNode read, ValueNode object, ValueNode location, CoreProviders tool) {
@@ -936,19 +911,12 @@ public static String referentFieldName() {
         return "referent";
     }
 
-    @Fold
     public static long referentOffset(@InjectedParameter MetaAccessProvider metaAccessProvider) {
         return referentField(metaAccessProvider).getOffset();
     }
 
-    @Fold
     public static ResolvedJavaField referentField(@InjectedParameter MetaAccessProvider metaAccessProvider) {
-        return getField(referenceType(metaAccessProvider), referentFieldName());
-    }
-
-    @Fold
-    public static ResolvedJavaType referenceType(@InjectedParameter MetaAccessProvider metaAccessProvider) {
-        return metaAccessProvider.lookupJavaType(Reference.class);
+        return getField(metaAccessProvider.lookupJavaType(Reference.class), referentFieldName());
     }
 
     public static final LocationIdentity OBJ_ARRAY_KLASS_ELEMENT_KLASS_LOCATION = new HotSpotOptimizingLocationIdentity("ObjArrayKlass::_element_klass") {

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java

@@ -111,16 +111,6 @@ public static Object verifyObject(Object object) {
         return object;
     }
 
-    @Fold
-    static long verifyOopMask(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.verifyOopMask;
-    }
-
-    @Fold
-    static long verifyOopBits(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.verifyOopBits;
-    }
-
     /**
      * Gets and clears the object result from a runtime call stored in a thread local.
      *

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsUtil.java

@@ -80,11 +80,6 @@ public static int getArrayBaseOffset(@InjectedParameter MetaAccessProvider metaA
         return metaAccessProvider.getArrayBaseOffset(elementKind);
     }
 
-    @Fold
-    public static int charArrayBaseOffset(@InjectedParameter MetaAccessProvider metaAccess) {
-        return metaAccess.getArrayBaseOffset(JavaKind.Char);
-    }
-
     @Fold
     public static long charArrayIndexScale(@InjectedParameter MetaAccessProvider metaAccess) {
         return metaAccess.getArrayIndexScale(JavaKind.Char);

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java

@@ -69,8 +69,6 @@
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
 
-import jdk.vm.ci.meta.ResolvedJavaType;
-
 /**
  * Implementation of the write barriers for the G1 garbage collector.
  */
@@ -374,10 +372,6 @@ public void g1ArrayRangePostWriteBarrier(Address address, long length, @Constant
 
     protected abstract ForeignCallDescriptor printfCallDescriptor();
 
-    protected abstract ResolvedJavaType referenceType();
-
-    protected abstract long referentOffset();
-
     protected boolean isTracingActive(int traceStartCycle) {
         return traceStartCycle > 0 && ((Pointer) WordFactory.pointer(gcTotalCollectionsAddress())).readInt(0) > traceStartCycle;
     }

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/KnownTruffleTypes.java

@@ -166,7 +166,6 @@ public class KnownTruffleTypes extends AbstractKnownTruffleTypes {
     public final ResolvedJavaField OptimizedCallTarget_rootNode = findField(OptimizedCallTarget, "rootNode");
 
     public final ResolvedJavaType OptimizedDirectCallNode = lookupTypeCached("com.oracle.truffle.runtime.OptimizedDirectCallNode");
-    public final ResolvedJavaField OptimizedDirectCallNode_currentCallTarget = findField(OptimizedDirectCallNode, "currentCallTarget");
     public final ResolvedJavaField OptimizedDirectCallNode_inliningForced = findField(OptimizedDirectCallNode, "inliningForced");
     public final ResolvedJavaField OptimizedDirectCallNode_callCount = findField(OptimizedDirectCallNode, "callCount");