Merge branch 'master' into GR-60108

Author: bulasevich

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!--
+  Please use the following template for Backport PRs
+
+  Make sure to use `git cherry-pick -x` when cherry picking the commits to backport.
+
+  Reference the upstream pull requests being backported, e.g. https://github.com/oracle/graal/pull/9836
+  if not upstream pull requests exists, then reference the upstream commit directly,
+  e.g. https://github.com/oracle/graal/commit/6e859d90dde01a23e6973e25984419f29edc9c2b
+
+  Example:
+
+  This PR backports:
+  - https://github.com/oracle/graal/pull/7427
+  - part of https://github.com/oracle/graal/pull/10864
+-->
+**This PR backports:**
+- https://github.com/oracle/graal/pull/
+
+<!-- Mention any conflicts and their resolution or that the backport applied cleanly -->
+**Conflicts:** There were no conflicts.
+
+<!-- Add the backport issue that this PR closes -->
+Closes: https://github.com/graalvm/graalvm-community-jdk21u/issues/

MAINTAINING.md

@@ -26,4 +26,5 @@ Between step 1 and 3 no new pull requests should be merged.
 
 * [Boris Ulasevich](https://github.com/bulasevich)
 * [Cesar Soares](https://github.com/JohnTortugo)
+* [John Spurling](https://github.com/synecdoche)
 * [Volker Simonis](https://github.com/simonis/)

compiler/mx.compiler/suite.py

@@ -4,7 +4,7 @@
   "sourceinprojectwhitelist" : [],
 
   "groupId" : "org.graalvm.compiler",
-  "version" : "23.1.8",
+  "version" : "23.1.9",
   "release" : False,
   "url" : "http://www.graalvm.org/",
   "developer" : {
@@ -85,33 +85,39 @@
       "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/batik-all-1.7.jar"],
     },
 
-    "ASM_9.5" : {
-      "digest" : "sha512:9e65f2983783725bae196ca939b45246958731246df1c495089c8ea5ce646de77c4e01a5a9ba10642016bb3258e1727e9ebcece6e74d9e3c32f528025d76b955",
+    "ASM_9.7.1" : {
+      "digest" : "sha512:4767b01603dad5c79cc1e2b5f3722f72b1059d928f184f446ba11badeb1b381b3a3a9a801cc43d25d396df950b09d19597c73173c411b1da890de808b94f1f50",
+      "sourceDigest" : "sha512:d7c0de5912d04949a3d06cad366ff35a877da2682d9c74579625d62686032ea9349aff6102b17f92e9ec7eb4e9b1cd906b649c6a3ac798bfb9e31e5425de009d",
       "maven" : {
         "groupId" : "org.ow2.asm",
         "artifactId" : "asm",
-        "version" : "9.5",
+        "version" : "9.7.1",
       },
+      "license" : "BSD-new",
     },
 
-    "ASM_TREE_9.5" : {
-      "digest" : "sha512:816de8f84c216a7bd97b2458bde64a4b99a039b7b59fbd1ef52edf8bf869edabb93967736fe0c61e8eb3e1520e0cefe69ba59cda12df30f9f85db75fb6c064f3",
+    "ASM_TREE_9.7.1" : {
+      "digest" : "sha512:e55008c392fdd35e95d3404766b12dd4b46e13d5c362fcd0ab42a65751a82737eaf0ebc857691d1916190d34407adfde4437615d69c278785416fd911e00978d",
+      "sourceDigest" : "sha512:3cea80bc7b55679dfa3d2065c6cb6951007cc7817082e9fcf4c5e3cdc073c22eddf7c7899cff60b1092049ec9038e8d3aa9a8828ef731739bda8b5afcec30e86",
       "maven" : {
         "groupId" : "org.ow2.asm",
         "artifactId" : "asm-tree",
-        "version" : "9.5",
+        "version" : "9.7.1",
       },
-      "dependencies" : ["ASM_9.5"],
+      "dependencies" : ["ASM_9.7.1"],
+      "license" : "BSD-new",
     },
 
-    "ASM_UTIL_9.5" : {
-      "digest" : "sha512:f68284d8f8fd029f3f428112225b2035ed3a4216cf3b34e0aacc83c32a6d44ab5e5d128b60a13ef768e3396041a62cf63f7fd3445dc5a05ce0ae03a2b2ed3080",
+    "ASM_UTIL_9.7.1" : {
+      "digest" : "sha512:522d793d15a2c5ea6504a50222cf0750f1eab7b881cf289675042539b1aba8b3868197b1bebe729de728dd10020eb028ae16252dcd5d84fdcbf7f925832bc269",
+      "sourceDigest" : "sha512:387aa887bfec24aec287d9aacebfdc0c2e1ab16a4adce933aecac6fc41545ce43a3eea0ed139db52dd0d0af910cfd2162aa4d6330a81b32b64b36f03b49db66a",
       "maven" : {
         "groupId" : "org.ow2.asm",
         "artifactId" : "asm-util",
-        "version" : "9.5",
+        "version" : "9.7.1",
       },
-      "dependencies" : ["ASM_9.5"],
+      "dependencies" : ["ASM_9.7.1"],
+      "license" : "BSD-new",
     },
 
     "HSDIS" : {
@@ -236,8 +242,8 @@
       "dependencies" : [
         "jdk.internal.vm.compiler",
         "mx:JUNIT",
-        "ASM_TREE_9.5",
-        "ASM_UTIL_9.5",
+        "ASM_TREE_9.7.1",
+        "ASM_UTIL_9.7.1",
         "JAVA_ALLOCATION_INSTRUMENTER",
         "truffle:TRUFFLE_SL_TEST",
         "truffle:TRUFFLE_TEST",
@@ -456,8 +462,8 @@
         "truffle:TRUFFLE_COMPILER",
         "truffle:TRUFFLE_RUNTIME",
         "regex:TREGEX",
-        "ASM_TREE_9.5",
-        "ASM_UTIL_9.5",
+        "ASM_TREE_9.7.1",
+        "ASM_UTIL_9.7.1",
       ],
       "exclude" : [
         "mx:JUNIT",

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024, 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 org.graalvm.compiler.core.aarch64.test;
+
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.junit.Test;
+
+/**
+ * Add/sub with an immediate MIN_VALUE may result in infinite recursion since MIN_VALUE < 0 and
+ * -MIN_VALUE < 0.
+ */
+public class AddSubInfiniteRecursionTest extends GraalCompilerTest {
+    public static int testAddIntMinValue(int arg) {
+        return arg + Integer.MIN_VALUE;
+    }
+
+    public static int testSubIntMinValue(int arg) {
+        return arg - Integer.MIN_VALUE;
+    }
+
+    @Test
+    public void runIntMinValue() {
+        test("testAddIntMinValue", 0);
+        test("testSubIntMinValue", 0);
+    }
+}

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -27,29 +27,40 @@
 import java.util.ArrayList;
 import java.util.Optional;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.graalvm.compiler.api.directives.GraalDirectives;
+import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.hotspot.replacements.ObjectCloneNode;
 import org.graalvm.compiler.nodes.GraphState;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.BasePhase;
+import org.graalvm.compiler.phases.common.HighTierLoweringPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.virtual.phases.ea.FinalPartialEscapePhase;
-import org.junit.Assert;
-import org.junit.Test;
+
+import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
  * Exercise intrinsification of {@link Object#clone}.
  */
 public class ObjectCloneTest extends GraalCompilerTest {
 
+    @Override
+    protected InstalledCode getCode(final ResolvedJavaMethod installedCodeOwner, StructuredGraph graph, boolean forceCompile, boolean installAsDefault, OptionValues options) {
+        OptionValues newOptions = new OptionValues(options, GraalOptions.PartialEscapeAnalysis, false);
+        return super.getCode(installedCodeOwner, graph, forceCompile, installAsDefault, newOptions);
+    }
+
     @Override
     protected Suites createSuites(OptionValues opts) {
         Suites suites = super.createSuites(opts);
-        var pos = suites.getHighTier().findPhase(FinalPartialEscapePhase.class);
+        var pos = suites.getHighTier().findPhase(HighTierLoweringPhase.class);
         pos.previous();
         pos.add(new BasePhase<HighTierContext>() {
             @Override
@@ -71,10 +82,36 @@ protected void run(StructuredGraph graph, HighTierContext context) {
         return suites;
     }
 
+    @BytecodeParserNeverInline
     public static Object cloneArray(int[] array) {
         return array.clone();
     }
 
+    private static final class ArrayHolder<T> {
+        T[] array;
+
+        private ArrayHolder(T[] array) {
+            this.array = array;
+        }
+    }
+
+    public static Object[] cloneGenericObjectArray(ArrayHolder<Object> holder) {
+        return holder.array.clone();
+    }
+
+    public static Number[] cloneDynamicObjectArray(ArrayHolder<Number> holder) {
+        return holder.array.clone();
+    }
+
+    public static Integer[] cloneConcreteObjectArray(ArrayHolder<Integer> holder) {
+        return holder.array.clone();
+    }
+
+    @BytecodeParserNeverInline
+    public static <T> T[] cloneArrayGeneric(T[] array) {
+        return array.clone();
+    }
+
     public static Object cloneList(ArrayList<?> list) {
         return list.clone();
     }
@@ -115,6 +152,21 @@ public void testArray() throws Throwable {
         test("cloneArray", new int[]{1, 2, 4, 3});
     }
 
+    @Test
+    public void testGenericObjectArray() throws Throwable {
+        test("cloneGenericObjectArray", new ArrayHolder<>(new Integer[]{1, 2, 4, 3}));
+    }
+
+    @Test
+    public void testDynamicObjectArray() throws Throwable {
+        test("cloneDynamicObjectArray", new ArrayHolder<>(new Number[]{1, 2, 4, 3}));
+    }
+
+    @Test
+    public void testConcreteObjectArray() throws Throwable {
+        test("cloneConcreteObjectArray", new ArrayHolder<>(new Integer[]{1, 2, 3, 4}));
+    }
+
     @Test
     public void testList() throws Throwable {
         ArrayList<Object> list = new ArrayList<>();
@@ -142,10 +194,13 @@ public void testCloneConstantArray() {
 
     public static Object cloneArrayWithImpreciseStamp(int[] inputArray, int count) {
         int[] array = inputArray;
-        for (int i = 0; i < count; i++) {
-            if (i > 3) {
-                array = new int[i];
-                array[i - 1] = i;
+        for (int j = 0; j < count; j++) {
+            for (int i = 0; i < j; i++) {
+                if (i > 3) {
+                    array = new int[i];
+                    array[i - 1] = i;
+                }
+                GraalDirectives.controlFlowAnchor();
             }
             GraalDirectives.controlFlowAnchor();
         }
@@ -156,4 +211,44 @@ public static Object cloneArrayWithImpreciseStamp(int[] inputArray, int count) {
     public void testCloneArrayWithImpreciseStamp() {
         test("cloneArrayWithImpreciseStamp", ARRAY, ARRAY.length);
     }
+
+    public static Object cloneArrayWithImpreciseStampInlined(int[] inputArray, int count) {
+        int[] array = inputArray;
+        for (int j = 0; j < count; j++) {
+            for (int i = 0; i < j; i++) {
+                if (i > 3) {
+                    array = new int[i];
+                    array[i - 1] = i;
+                }
+                GraalDirectives.controlFlowAnchor();
+            }
+            GraalDirectives.controlFlowAnchor();
+        }
+        return cloneArray(array);
+    }
+
+    @Test
+    public void testCloneArrayWithImpreciseStampInlined() {
+        test("cloneArrayWithImpreciseStampInlined", ARRAY, ARRAY.length);
+    }
+
+    public static Object cloneArrayWithImpreciseStampInlinedGeneric(Integer[] inputArray, int count) {
+        Integer[] array = inputArray;
+        for (int j = 0; j < count; j++) {
+            for (int i = 0; i < j; i++) {
+                if (i > 3) {
+                    array = new Integer[i];
+                    array[i - 1] = i;
+                }
+                GraalDirectives.controlFlowAnchor();
+            }
+            GraalDirectives.controlFlowAnchor();
+        }
+        return cloneArrayGeneric(array);
+    }
+
+    @Test
+    public void testCloneArrayWithImpreciseStampInlinedGeneric() {
+        test("cloneArrayWithImpreciseStampInlinedGeneric", new Integer[]{1, 2, 3, 4}, ARRAY.length);
+    }
 }

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeReplacementsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -155,6 +155,15 @@ public void testCompareAndSet() {
         test("unsafeCompareAndSetDouble");
     }
 
+    public static Boolean unsafeCompareAndSetFloatVar(Container c) {
+        return unsafe.compareAndSetFloat(c, floatOffset, 1.0f, 2.0f);
+    }
+
+    @Test
+    public void testUnsafeCompareAndSetFloatVar() {
+        test("unsafeCompareAndSetFloatVar", new Container());
+    }
+
     public static boolean unsafeWeakCompareAndSetBoolean() {
         Container container = new Container();
         boolean success = false;