Check major version of running JVM matches agent; warn if full version differs.

Author: DSouzaM

substratevm/CHANGELOG.md

@@ -4,6 +4,7 @@ This changelog summarizes major changes to GraalVM Native Image.
 
 ## GraalVM for JDK 25
 * (GR-58668) Enabled [Whole-Program Sparse Conditional Constant Propagation (WP-SCCP)](https://github.com/oracle/graal/pull/9821) by default, improving the precision of points-to analysis in Native Image. This optimization enhances static analysis accuracy and scalability, potentially reducing the size of the final native binary.
+* (GR-59864) Added JVM version check to the Native Image agent. The agent will abort execution if the JVM major version does not match the version it was built with, and warn if the full JVM version is different.
 
 ## GraalVM for JDK 24 (Internal Version 24.2.0)
 * (GR-59717) Added `DuringSetupAccess.registerObjectReachabilityHandler` to allow registering a callback that is executed when an object of a specified type is marked as reachable during heap scanning.

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java

@@ -224,6 +224,10 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
             }
         }
 
+        if (!checkJVMVersion(jvmti)) {
+            return USAGE_ERROR;
+        }
+
         if (traceOutputFile == null && configOutputDir == null) {
             configOutputDir = transformPath(AGENT_NAME + "_config-pid{pid}-{datetime}/");
             inform("no output options provided, tracking dynamic accesses and writing configuration to directory: " + configOutputDir);
@@ -420,6 +424,33 @@ private static int usage(String message) {
         return USAGE_ERROR;
     }
 
+    private static boolean checkJVMVersion(JvmtiEnv jvmti) {
+        String agentVersion = System.getProperty("java.vm.version");
+        int agentMajorVersion = Runtime.version().feature();
+
+        String vmVersion = Support.getSystemProperty(jvmti, "java.vm.version");
+        if (vmVersion == null) {
+            warn(String.format("Unable to determine the \"java.vm.version\" of the running JVM. Note that the JVM should have major version %d, otherwise metadata may be incorrect.",
+                            agentMajorVersion));
+            return true;
+        }
+
+        // Fail if the major versions differ.
+        if (!vmVersion.startsWith(Integer.toString(agentMajorVersion))) {
+            return error(false, String.format(
+                            "The current VM (%s) is incompatible with the agent, which was built for a JVM with major version %d. To resolve this issue, run the agent using a JVM with major version %d.",
+                            vmVersion, agentMajorVersion, agentMajorVersion));
+        }
+
+        // Warn if the VM is different.
+        if (!vmVersion.startsWith(agentVersion)) {
+            warn(String.format(
+                            "The running JVM (%s) is different from the JVM used to build the agent (%s). If the generated metadata is incorrect or incomplete, consider running the agent using the same JVM that built it.",
+                            vmVersion, agentVersion));
+        }
+        return true;
+    }
+
     private static AccessAdvisor createAccessAdvisor(boolean builtinHeuristicFilter, ConfigurationFilter callerFilter, ConfigurationFilter accessFilter) {
         AccessAdvisor advisor = new AccessAdvisor();
         advisor.setHeuristicsEnabled(builtinHeuristicFilter);