Espresso: Use Runtime.Version to find host version

oracle · Apr 15, 2024 · 81cf5d6 · 81cf5d6
1 parent 8bc2ee9
commit 81cf5d6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.../src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JavaVersion.java b/.../src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JavaVersion.java
@@ -60,7 +60,8 @@ public boolean contains(JavaVersion version) {
         }
     }
 
-    public static final JavaVersion HOST_VERSION = forVersion(System.getProperty("java.version"));
+    public static final JavaVersion HOST_VERSION = forVersion(Runtime.version());
+
     public static final int LATEST_SUPPORTED = 21;
 
     private final int version;
@@ -95,6 +96,10 @@ public static JavaVersion forVersion(String version) {
         }
     }
 
+    private static JavaVersion forVersion(Runtime.Version version) {
+        return forVersion(version.feature());
+    }
+
     public static JavaVersion latestSupported() {
         return forVersion(LATEST_SUPPORTED);
     }