Fix mx jvmci-version-check --as-tag for LTS versions.

Author: rschatz

compiler/mx.compiler/mx_compiler.py

@@ -182,8 +182,6 @@ def _capture_jvmci_version(args=None):
         if out.data:
             try:
                 (jdk_version, jvmci_major, jvmci_minor, jvmci_build) = out.data.split(',')
-                if jdk_version.endswith('-LTS'):
-                    jdk_version = jdk_version[:-len('-LTS')]
                 return JVMCIVersionCheckVersion(JavaLangRuntimeVersion(jdk_version), int(jvmci_major), int(jvmci_minor), int(jvmci_build))
             except ValueError:
                 mx.warn(f'Could not parse jvmci version from JVMCIVersionCheck output:\n{out.data}')

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java

@@ -225,6 +225,17 @@ public String printFormat(PrintFormat format) {
                 case AS_TAG -> toString();
             };
         }
+
+        public Version stripLTS() {
+            if ("LTS".equals(jdkVersion.optional().orElse(null))) {
+                String version = jdkVersion.toString();
+                assert version.endsWith("-LTS");
+                String stripped = version.substring(0, version.length() - 4);
+                return new Version(stripped, jvmciMajor, jvmciMinor, jvmciBuild, legacy, isOpenJDK);
+            } else {
+                return this;
+            }
+        }
     }
 
     public static final String OPEN_LABSJDK_RELEASE_URL_PATTERN = "https://github.com/graalvm/labs-openjdk-*/releases";
@@ -369,7 +380,7 @@ private String run(Version minVersion, PrintFormat format) {
             Version v = Version.parse(vmVersion);
             if (v != null) {
                 if (format != null) {
-                    System.out.println(v.printFormat(format));
+                    System.out.println(v.stripLTS().printFormat(format));
                 }
                 if (v.isLessThan(minVersion)) {
                     return String.format("The VM does not support the minimum JVMCI API version required by Graal: %s < %s.", v, minVersion);