Return real guest version in JDWP VirtualMachine.Version

gilles-duboscq · gilles-duboscq · commit c09364f3f919 · 2025-07-19T11:36:32.000+02:00
Also remove unused `VirtualMachine`/`VirtualMachineImpl`
diff --git a/espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java b/espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java
@@ -231,6 +231,10 @@ public int classFileVersion() {
         return version + 44;
     }
 
+    public int featureVersion() {
+        return version;
+    }
+
     @Override
     public int compareTo(JavaVersion o) {
         return Integer.compare(this.version, o.version);
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/Ids.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/Ids.java
@@ -38,6 +38,8 @@
  * JDWP. Each entity will be assigned a unique ID. Only weak references are kept for entities.
  */
 public final class Ids<T> {
+    public static final int ID_SIZE = 8;
+    private static final Pattern ANON_INNER_CLASS_PATTERN = Pattern.compile(".*\\$\\d+.*");
 
     private volatile long uniqueID = 1;
 
@@ -53,8 +55,6 @@ public final class Ids<T> {
      */
     private final T nullObject;
 
-    public static final Pattern ANON_INNER_CLASS_PATTERN = Pattern.compile(".*\\$\\d+.*");
-
     private HashMap<String, Long> innerClassIDMap = new HashMap<>(16);
 
     private List<Object> pinnedObjects = new ArrayList<>();
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
@@ -506,4 +506,8 @@ public interface JDWPContext {
     boolean isSteppingInProgress(Thread t);
 
     void replaceController(DebuggerController newController);
+
+    int getJavaFeatureVersion();
+
+    String getSystemProperty(String name);
 }
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
@@ -236,7 +236,7 @@ private void processPacket(Packet packet) {
                         case JDWP.VirtualMachine.ID: {
                             switch (packet.cmd) {
                                 case JDWP.VirtualMachine.VERSION.ID:
-                                    result = JDWP.VirtualMachine.VERSION.createReply(packet, controller.getVirtualMachine());
+                                    result = JDWP.VirtualMachine.VERSION.createReply(packet, context);
                                     break;
                                 case JDWP.VirtualMachine.CLASSES_BY_SIGNATURE.ID:
                                     result = JDWP.VirtualMachine.CLASSES_BY_SIGNATURE.createReply(packet, controller, context);
@@ -254,7 +254,7 @@ private void processPacket(Packet packet) {
                                     result = JDWP.VirtualMachine.DISPOSE.createReply(packet, controller);
                                     break;
                                 case JDWP.VirtualMachine.IDSIZES.ID:
-                                    result = JDWP.VirtualMachine.IDSIZES.createReply(packet, controller.getVirtualMachine());
+                                    result = JDWP.VirtualMachine.IDSIZES.createReply(packet);
                                     break;
                                 case JDWP.VirtualMachine.SUSPEND.ID:
                                     result = JDWP.VirtualMachine.SUSPEND.createReply(packet, controller);
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
@@ -93,7 +93,6 @@ public final class DebuggerController implements ContextsListener {
     private JDWPOptions options;
     private DebuggerSession debuggerSession;
     private Ids<Object> ids;
-    private final VirtualMachine vm;
     private Debugger debugger;
     private final GCPrevention gcPrevention;
     private final ThreadSuspension threadSuspension;
@@ -111,7 +110,6 @@ public final class DebuggerController implements ContextsListener {
     private volatile Throwable lateStartupError;
 
     public DebuggerController(TruffleLogger logger) {
-        this.vm = new VirtualMachineImpl();
         this.gcPrevention = new GCPrevention();
         this.threadSuspension = new ThreadSuspension();
         this.eventFilters = new EventFilters();
@@ -658,10 +656,6 @@ public void prepareMethodBreakpoint(MethodBreakpointEvent event) {
         methodBreakpointExpected.put(Thread.currentThread(), event);
     }
 
-    public VirtualMachine getVirtualMachine() {
-        return vm;
-    }
-
     public GCPrevention getGCPrevention() {
         return gcPrevention;
     }
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -36,6 +36,7 @@
 import com.oracle.truffle.espresso.jdwp.api.ClassStatusConstants;
 import com.oracle.truffle.espresso.jdwp.api.ErrorCodes;
 import com.oracle.truffle.espresso.jdwp.api.FieldRef;
+import com.oracle.truffle.espresso.jdwp.api.Ids;
 import com.oracle.truffle.espresso.jdwp.api.JDWPConstantPool;
 import com.oracle.truffle.espresso.jdwp.api.JDWPContext;
 import com.oracle.truffle.espresso.jdwp.api.KlassRef;
@@ -65,13 +66,36 @@ static class VirtualMachine {
         static class VERSION {
             public static final int ID = 1;
 
-            static CommandResult createReply(Packet packet, com.oracle.truffle.espresso.jdwp.impl.VirtualMachine vm) {
+            static CommandResult createReply(Packet packet, JDWPContext context) {
                 PacketStream reply = new PacketStream().replyPacket().id(packet.id);
-                reply.writeString(vm.getVmDescription());
-                reply.writeInt(1);
-                reply.writeInt(8);
-                reply.writeString(vm.getVmVersion());
-                reply.writeString(vm.getVmName());
+                int majorVersion;
+                int minorVersion;
+                int featureVersion = context.getJavaFeatureVersion();
+                if (featureVersion < 9) {
+                    majorVersion = 1;
+                    minorVersion = featureVersion;
+                } else if (featureVersion < 11) {
+                    majorVersion = 9;
+                    minorVersion = 0;
+                } else if (featureVersion < 13) {
+                    majorVersion = 11;
+                    minorVersion = 0;
+                } else {
+                    majorVersion = featureVersion;
+                    minorVersion = 0;
+                }
+                String javaVersion = context.getSystemProperty("java.version");
+                String vmName = context.getSystemProperty("java.vm.name");
+                String vmInfo = context.getSystemProperty("java.vm.info");
+                reply.writeString(String.format("""
+                                Java Debug Wire Protocol version %d.%d
+                                JVM Debug Interface version %d.%d
+                                JVM version %s (%s, %s)""", majorVersion, minorVersion, majorVersion, minorVersion,
+                                javaVersion, vmName, vmInfo));
+                reply.writeInt(majorVersion);
+                reply.writeInt(minorVersion);
+                reply.writeString(javaVersion);
+                reply.writeString(vmName);
                 return new CommandResult(reply);
             }
         }
@@ -173,13 +197,13 @@ static CommandResult createReply(Packet packet, DebuggerController controller) {
         static class IDSIZES {
             public static final int ID = 7;
 
-            static CommandResult createReply(Packet packet, com.oracle.truffle.espresso.jdwp.impl.VirtualMachine vm) {
+            static CommandResult createReply(Packet packet) {
                 PacketStream reply = new PacketStream().replyPacket().id(packet.id);
-                reply.writeInt(vm.getSizeOfFieldRef());
-                reply.writeInt(vm.getSizeOfMethodRef());
-                reply.writeInt(vm.getSizeofObjectRef());
-                reply.writeInt(vm.getSizeOfClassRef());
-                reply.writeInt(vm.getSizeOfFrameRef());
+                reply.writeInt(Ids.ID_SIZE);
+                reply.writeInt(Ids.ID_SIZE);
+                reply.writeInt(Ids.ID_SIZE);
+                reply.writeInt(Ids.ID_SIZE);
+                reply.writeInt(Ids.ID_SIZE);
                 return new CommandResult(reply);
             }
         }
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/VirtualMachine.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/VirtualMachine.java
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/VirtualMachineImpl.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/VirtualMachineImpl.java
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/EspressoSymbols.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/EspressoSymbols.java
@@ -1378,6 +1378,7 @@ public static class Signatures {
                         Types.java_lang_Object);
         public static final Symbol<Signature> UnknownKeyException_Object_Throwable = SYMBOLS.putSignature(Types.com_oracle_truffle_espresso_polyglot_UnknownKeyException,
                         Types.java_lang_Object, Types.java_lang_Throwable);
+        public static final Symbol<Signature> String_String = SYMBOLS.putSignature(Types.java_lang_String, Types.java_lang_String);
 
         // JVMCI
         public static final Symbol<Signature> EspressoJVMCIRuntime = SYMBOLS.putSignature(Types.com_oracle_truffle_espresso_jvmci_EspressoJVMCIRuntime);
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java
@@ -660,6 +660,7 @@ public Meta(EspressoContext context) {
 
         java_lang_System = knownKlass(Types.java_lang_System);
         java_lang_System_exit = java_lang_System.requireDeclaredMethod(Names.exit, Signatures._void_int);
+        java_lang_System_getProperty = java_lang_System.requireDeclaredMethod(Names.getProperty, Signatures.String_String);
         java_lang_System_securityManager = diff() //
                         .field(VERSION_21_OR_LOWER, Names.security, Types.java_lang_SecurityManager) //
                         .notRequiredField(java_lang_System);
@@ -1784,6 +1785,7 @@ private DiffVersionLoadHelper diff() {
     public final Method java_lang_System_initPhase1;
     public final Method java_lang_System_initPhase2;
     public final Method java_lang_System_initPhase3;
+    public final Method java_lang_System_getProperty;
     public final Method java_lang_System_exit;
     public final Field java_lang_System_securityManager;
     public final Field java_lang_System_in;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
@@ -830,4 +830,16 @@ public ModuleRef[] getAllModulesRefs() {
     public synchronized int redefineClasses(List<RedefineInfo> redefineInfos) {
         return context.getClassRedefinition().redefineClasses(redefineInfos, false, true);
     }
+
+    @Override
+    public int getJavaFeatureVersion() {
+        return context.getJavaVersion().featureVersion();
+    }
+
+    @Override
+    public String getSystemProperty(String name) {
+        Meta meta = context.getMeta();
+        StaticObject guestString = (StaticObject) meta.java_lang_System_getProperty.invokeDirectStatic(meta.toGuestString(name));
+        return meta.toHostString(guestString);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -506,4 +506,8 @@ public interface JDWPContext {`
`506`	`506`	`boolean isSteppingInProgress(Thread t);`
`507`	`507`
`508`	`508`	`void replaceController(DebuggerController newController);`
	`509`	`+`
	`510`	`+ int getJavaFeatureVersion();`
	`511`	`+`
	`512`	`+ String getSystemProperty(String name);`
`509`	`513`	`}`