[GR-56295] Fix: allow GraalVM versions with more than 3 components.

PullRequest: graalpython/3505

Author: steve-s

graalpython/com.oracle.graal.python.resources/src/com/oracle/graal/python/resources/PythonResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -69,6 +69,7 @@ public final class PythonResource implements InternalResource {
     private static final int VERSION_BASE = '!';
 
     static {
+        // See static ctor of PythonLanguage
         try (InputStream is = PythonResource.class.getResourceAsStream("/graalpy_versions")) {
             PYTHON_MAJOR = is.read() - VERSION_BASE;
             PYTHON_MINOR = is.read() - VERSION_BASE;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -222,6 +222,9 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
                 RELEASE_LEVEL_STRING = tsLiteral("final");
         }
 
+        // The resource file is built by mx from "graalpy-versions" project using mx substitutions.
+        // The actual values of the versions are computed by mx helper functions py_version_short,
+        // graal_version_short, and dev_tag defined in mx_graalpython.py
         try (InputStream is = PythonLanguage.class.getResourceAsStream("/graalpy_versions")) {
             int ch;
             if (MAJOR != (ch = is.read() - VERSION_BASE)) {

mx.graalpython/mx_graalpython.py

@@ -1833,7 +1833,10 @@ def graal_version_short(variant=None, **kwargs):
     if variant == 'major_minor_nodot':
         return GRAAL_VERSION_MAJ_MIN.replace(".", "")
     elif variant == 'binary':
-        return "".join([chr(int(p) + ord(VERSION_BASE)) for p in GRAAL_VERSION.split(".")])
+        # PythonLanguage and PythonResource consume this data, and they assume 3 components
+        # (although the 3rd is not used), so we cap the list size to 3 although the version
+        # may have even more components
+        return "".join([chr(int(p) + ord(VERSION_BASE)) for p in GRAAL_VERSION.split(".")[:3]])
     else:
         return GRAAL_VERSION_MAJ_MIN