Add option -XX:+PrintVMInfoAndExit.

Author: christianhaeubl

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java

@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.function.BooleanSupplier;
 
-import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
@@ -80,6 +79,8 @@
 import com.oracle.svm.util.ClassUtil;
 import com.oracle.svm.util.ReflectionUtil;
 
+import jdk.graal.compiler.word.Word;
+
 @InternalVMMethod
 public class JavaMainWrapper {
     /*
@@ -218,6 +219,11 @@ private static int runCore0() {
                 VMRuntime.initialize();
             }
 
+            if (SubstrateOptions.PrintVMInfoAndExit.getValue()) {
+                printVmInfo();
+                return 0;
+            }
+
             if (SubstrateOptions.DumpHeapAndExit.getValue()) {
                 return VMInspectionOptions.dumpImageHeap() ? 0 : 1;
             }
@@ -438,6 +444,12 @@ public static String getCRuntimeArgument0() {
         return CTypeConversion.toJavaString(MAIN_ISOLATE_PARAMETERS.get().getArgv().read(0));
     }
 
+    private static void printVmInfo() {
+        VM vm = ImageSingletons.lookup(VM.class);
+        System.out.println(vm.formattedVmVersion);
+        System.out.println(vm.formattedJdkVersion);
+    }
+
     private static final class EnterCreateIsolateWithCArgumentsPrologue implements CEntryPointOptions.Prologue {
         private static final CGlobalData<CCharPointer> errorMessage = CGlobalDataFactory.createCString(
                         "Failed to create the main Isolate.");

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java

@@ -860,7 +860,7 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
             log.string("Build time information:").indent(true);
 
             VM vm = ImageSingletons.lookup(VM.class);
-            log.string("Version: ").string(vm.vendorVersion).string(" (").string(vm.info).string("), JDK ").string(vm.version).newline();
+            log.string("Version: ").string(vm.formattedVmVersion).string(", ").string(vm.formattedJdkVersion).newline();
 
             Platform platform = ImageSingletons.lookup(Platform.class);
             log.string("Platform: ").string(platform.getOS()).string("/").string(platform.getArchitecture()).newline();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -1172,6 +1172,9 @@ public Boolean getValue(OptionValues values) {
     @Option(help = "Create a heap dump and exit.")//
     public static final RuntimeOptionKey<Boolean> DumpHeapAndExit = new RuntimeOptionKey<>(false, Immutable);
 
+    @Option(help = "Print some VM information and exit.")//
+    public static final RuntimeOptionKey<Boolean> PrintVMInfoAndExit = new RuntimeOptionKey<>(false, Immutable);
+
     @Option(help = "Enable Java Flight Recorder.")//
     public static final RuntimeOptionKey<Boolean> FlightRecorder = new RuntimeOptionKey<>(false, Immutable);
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VM.java

@@ -35,13 +35,20 @@ public final class VM {
     public final String vendorUrl;
     public final String vendorVersion;
 
+    /* Preformatted version strings based on the values above. */
+    public final String formattedVmVersion;
+    public final String formattedJdkVersion;
+
     @Platforms(Platform.HOSTED_ONLY.class)
     public VM(String vmInfo) {
         info = vmInfo;
         version = getVersion();
         vendor = getVendor();
         vendorUrl = getVendorUrl();
         vendorVersion = getVendorVersion();
+
+        formattedVmVersion = vendorVersion + " (" + info + ")";
+        formattedJdkVersion = "JDK " + version;
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/dcmd/VMVersionDmd.java

@@ -43,6 +43,6 @@ public VMVersionDmd() {
     @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+18/src/hotspot/share/services/diagnosticCommand.cpp#L234-L246")
     public String execute(DCmdArguments args) throws Throwable {
         VM vm = ImageSingletons.lookup(VM.class);
-        return vm.vendorVersion + " (" + vm.info + ")" + System.lineSeparator() + "JDK " + vm.version;
+        return vm.formattedVmVersion + System.lineSeparator() + vm.formattedJdkVersion;
     }
 }