Merge pull request #169 from bulasevich/GR-59688

[Backport][GR-59688] Allow compiler newer than Truffle runtime in a minor version.

Author: zakkak

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.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -33,6 +33,9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -166,6 +169,20 @@
  */
 public final class TruffleBaseFeature implements InternalFeature {
 
+    private static final MethodHandle VERSION_GET_COMPONENT = findVersionGetComponent();
+
+    @SuppressWarnings("unchecked")
+    private static MethodHandle findVersionGetComponent() {
+        try {
+            return MethodHandles.lookup().findVirtual(Version.class, "getComponent", MethodType.methodType(int.class, int.class));
+        } catch (ReflectiveOperationException e) {
+            /*
+             * Old org.graalvm.polyglot module without Version#getComponent(int) method.
+             */
+            return null;
+        }
+    }
+
     private static final String NATIVE_IMAGE_FILELIST_FILE_NAME = "native-image-resources.filelist";
 
     private static final Version NEXT_POLYGLOT_VERSION_UPDATE = Version.create(25, 1);
@@ -306,11 +323,13 @@ private Object processInlinedField(Object obj) {
     public void afterRegistration(AfterRegistrationAccess a) {
         if (!Boolean.getBoolean("polyglotimpl.DisableVersionChecks")) {
             Version truffleVersion = getTruffleVersion(a);
+            Version truffleMajorMinorVersion = stripUpdateVersion(truffleVersion);
             Version featureVersion = getSVMFeatureVersion();
+            Version featureMajorMinorVersion = stripUpdateVersion(featureVersion);
             if (featureVersion.compareTo(NEXT_POLYGLOT_VERSION_UPDATE) >= 0) {
                 throw new AssertionError("MAX_JDK_VERSION must be updated, please contact the Truffle team!");
             }
-            if (featureVersion.compareTo(truffleVersion) > 0) {
+            if (featureMajorMinorVersion.compareTo(truffleMajorMinorVersion) > 0) {
                 // no forward compatibility
                 throw throwVersionError("""
                                 Your Java runtime '%s' with native-image feature version '%s' is incompatible with polyglot version '%s'.
@@ -386,6 +405,28 @@ private Version getSVMFeatureVersion() {
         }
     }
 
+    private static Version stripUpdateVersion(Version version) {
+        if (VERSION_GET_COMPONENT != null) {
+            int major;
+            int minor;
+            try {
+                major = (int) VERSION_GET_COMPONENT.invoke(version, 0);
+                minor = (int) VERSION_GET_COMPONENT.invoke(version, 1);
+            } catch (Throwable t) {
+                throw new AssertionError(t);
+            }
+            if (major != 0 || minor != 0) {
+                return Version.create(major, minor);
+            } else {
+                /*
+                 * Version represents a pure snapshot version without any numeric component.
+                 * Continue and return the original version.
+                 */
+            }
+        }
+        return version;
+    }
+
     private static RuntimeException throwVersionError(String errorFormat, Object... args) {
         StringBuilder errorMessage = new StringBuilder("Polyglot version compatibility check failed.\n");
         errorMessage.append(String.format(errorFormat, args));

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntimeAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -136,25 +136,30 @@ protected static TruffleRuntime createRuntime() {
                 if (truffleVersion.compareTo(NEXT_VERSION_UPDATE) >= 0) {
                     throw new AssertionError("MIN_COMPILER_VERSION, MIN_JDK_VERSION and MAX_JDK_VERSION must be updated!");
                 }
+                Version truffleMajorMinorVersion = stripUpdateVersion(truffleVersion);
                 Version compilerVersion = getCompilerVersion(compilationSupport);
+                Version compilerMajorMinorVersion = stripUpdateVersion(compilerVersion);
                 int jdkFeatureVersion = Runtime.version().feature();
                 if (jdkFeatureVersion < MIN_JDK_VERSION || jdkFeatureVersion >= MAX_JDK_VERSION) {
-                    throw throwVersionError("""
+                    return new DefaultTruffleRuntime(formatVersionWarningMessage("""
                                     Your Java runtime '%s' with compiler version '%s' is incompatible with polyglot version '%s'.
                                     The Java runtime version must be greater or equal to JDK '%d' and smaller than JDK '%d'.
                                     Update your Java runtime to resolve this.
-                                    """, Runtime.version(), compilerVersion, truffleVersion, MIN_JDK_VERSION, MAX_JDK_VERSION);
-                } else if (compilerVersion.compareTo(truffleVersion) > 0) {
-                    // no forward compatibility
-                    throw throwVersionError("""
+                                    """, Runtime.version(), compilerVersion, truffleVersion, MIN_JDK_VERSION, MAX_JDK_VERSION));
+                } else if (compilerMajorMinorVersion.compareTo(truffleMajorMinorVersion) > 0) {
+                    /*
+                     * Forward compatibility is supported only for minor updates, not for major
+                     * releases.
+                     */
+                    return new DefaultTruffleRuntime(formatVersionWarningMessage("""
                                     Your Java runtime '%s' with compiler version '%s' is incompatible with polyglot version '%s'.
                                     Update the org.graalvm.polyglot versions to at least '%s' to resolve this.
-                                    """, Runtime.version(), compilerVersion, truffleVersion, compilerVersion);
+                                    """, Runtime.version(), compilerVersion, truffleVersion, compilerVersion));
                 } else if (compilerVersion.compareTo(MIN_COMPILER_VERSION) < 0) {
-                    throw throwVersionError("""
+                    return new DefaultTruffleRuntime(formatVersionWarningMessage("""
                                     Your Java runtime '%s' with compiler version '%s' is incompatible with polyglot version '%s'.
                                     Update the Java runtime to the latest update release of JDK '%d'.
-                                    """, Runtime.version(), compilerVersion, truffleVersion, jdkFeatureVersion);
+                                    """, Runtime.version(), compilerVersion, truffleVersion, jdkFeatureVersion));
                 }
             }
         } else {
@@ -171,12 +176,14 @@ protected static TruffleRuntime createRuntime() {
                 compilationSupport = (TruffleCompilationSupport) hotspotCompilationSupport.getConstructor().newInstance();
                 if (!Boolean.getBoolean("polyglotimpl.DisableVersionChecks")) {
                     Version truffleVersion = getTruffleVersion();
+                    Version truffleMajorMinorVersion = stripUpdateVersion(truffleVersion);
                     Version compilerVersion = getCompilerVersion(compilationSupport);
-                    if (!compilerVersion.equals(truffleVersion)) {
-                        throw throwVersionError("""
+                    Version compilerMajorMinorVersion = stripUpdateVersion(compilerVersion);
+                    if (!compilerMajorMinorVersion.equals(truffleMajorMinorVersion)) {
+                        return new DefaultTruffleRuntime(formatVersionWarningMessage("""
                                         The Graal compiler version '%s' is incompatible with polyglot version '%s'.
                                         Update the compiler version to '%s' to resolve this.
-                                        """, compilerVersion, truffleVersion, truffleVersion);
+                                        """, compilerVersion, truffleVersion, truffleVersion));
                     }
                 }
             } catch (ReflectiveOperationException e) {
@@ -188,18 +195,27 @@ protected static TruffleRuntime createRuntime() {
         return rt;
     }
 
-    private static RuntimeException throwVersionError(String errorFormat, Object... args) {
-        StringBuilder errorMessage = new StringBuilder("Polyglot version compatibility check failed.\n");
+    private static Version stripUpdateVersion(Version version) {
+        int major = version.getComponent(0);
+        int minor = version.getComponent(1);
+        if (major == 0 && minor == 0) {
+            /*
+             * Version represents a pure snapshot version without any numeric component.
+             */
+            return version;
+        } else {
+            return Version.create(major, minor);
+        }
+    }
+
+    private static String formatVersionWarningMessage(String errorFormat, Object... args) {
+        StringBuilder errorMessage = new StringBuilder("Version check failed.\n");
         errorMessage.append(String.format(errorFormat, args));
         errorMessage.append("""
-                        Alternatively, it is possible to switch to the fallback runtime with -Dtruffle.UseFallbackRuntime=true.
-                        The fallback runtime is compatible to any Java 17 capable JDK.
-                        Execution with the fallback runtime does not support runtime compilation and therefore will negatively impact the guest application performance.
-                        For more information see: https://www.graalvm.org/latest/reference-manual/embed-languages/#runtime-optimization-support.
                         To disable this version check the '-Dpolyglotimpl.DisableVersionChecks=true' system property can be used.
                         It is not recommended to disable version checks.
                         """);
-        throw new IllegalStateException(errorMessage.toString());
+        return errorMessage.toString();
     }
 
     /**