[GR-67858] Clear field breakpoints on detach.

PullRequest: graal/21811

Author: entlicher

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListener.java

@@ -25,6 +25,7 @@
 import com.oracle.truffle.espresso.jdwp.impl.BreakpointInfo;
 import com.oracle.truffle.espresso.jdwp.impl.ClassPrepareRequest;
 import com.oracle.truffle.espresso.jdwp.impl.FieldBreakpointEvent;
+import com.oracle.truffle.espresso.jdwp.impl.FieldBreakpointInfo;
 import com.oracle.truffle.espresso.jdwp.impl.MethodBreakpointEvent;
 import com.oracle.truffle.espresso.jdwp.impl.RequestFilter;
 import com.oracle.truffle.espresso.jdwp.impl.SocketConnection;
@@ -57,6 +58,10 @@ public interface VMEventListener extends VMListener {
 
     void removeBreakpointRequest(int requestId);
 
+    void addFieldRequest(FieldBreakpointInfo info);
+
+    void removeFieldRequest(int requestId, FieldRef field);
+
     void stepCompleted(SteppingInfo info, CallFrame currentFrame);
 
     void exceptionThrown(BreakpointInfo info, Object currentThread, Object exception, CallFrame[] callFrames);

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListenerImpl.java

@@ -64,6 +64,7 @@ public final class VMEventListenerImpl implements VMEventListener {
     private final HashMap<Integer, RequestFilter> monitorContendedEnteredRequests = new HashMap<>();
     private final HashMap<Integer, RequestFilter> monitorWaitRequests = new HashMap<>();
     private final HashMap<Integer, RequestFilter> monitorWaitedRequests = new HashMap<>();
+    private final HashMap<Integer, FieldRef> fieldRequests = new HashMap<>();
 
     // The connection field is null only until the connection is established. Thus, we need
     // to guard any attempted usage prior to that, e.g. vm dies event.
@@ -108,6 +109,7 @@ public void onDetach() {
         monitorContendedEnteredRequests.clear();
         monitorWaitedRequests.clear();
         monitorWaitRequests.clear();
+        removeFieldRequests();
 
         /*
          * We don't null the connection field here, since there's a race condition between preparing
@@ -160,6 +162,26 @@ public void clearAllBreakpointRequests() {
         breakpointRequests.clear();
     }
 
+    @Override
+    public void addFieldRequest(FieldBreakpointInfo info) {
+        FieldRef field = info.getField();
+        field.addFieldBreakpointInfo(info);
+        fieldRequests.put(info.getRequestId(), field);
+    }
+
+    @Override
+    public void removeFieldRequest(int requestId, FieldRef field) {
+        field.removeFieldBreakpointInfo(requestId);
+        fieldRequests.remove(requestId, field);
+    }
+
+    private void removeFieldRequests() {
+        for (Map.Entry<Integer, FieldRef> entry : fieldRequests.entrySet()) {
+            entry.getValue().removeFieldBreakpointInfo(entry.getKey());
+        }
+        fieldRequests.clear();
+    }
+
     @Override
     @TruffleBoundary
     public boolean onFieldModification(FieldRef field, Node node, Object receiver, Object value) {

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java

@@ -630,7 +630,7 @@ private void processPacket(Packet packet) {
                                     result = requestedJDWPEvents.clearRequest(packet);
                                     break;
                                 case JDWP.EventRequest.CLEAR_ALL_BREAKPOINTS.ID:
-                                    result = requestedJDWPEvents.clearAllRequests(packet);
+                                    result = requestedJDWPEvents.clearAllBreakpointRequests(packet);
                                     break;
                                 default:
                                     result = unknownCommand(packet, controller);

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/FieldBreakpointInfo.java

@@ -66,6 +66,6 @@ public boolean isAccessBreakpoint() {
 
     @Override
     public void dispose() {
-        field.disposeFieldBreakpoint();
+        field.removeFieldBreakpointInfo(getRequestId());
     }
 }

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/RequestedJDWPEvents.java

@@ -144,15 +144,15 @@ public CommandResult registerEvent(Packet packet, Commands callback) {
                 FieldBreakpointInfo fieldBreakpointInfo = (FieldBreakpointInfo) filter.getBreakpointInfo();
                 fieldBreakpointInfo.addSuspendPolicy(suspendPolicy);
                 fieldBreakpointInfo.setAccessBreakpoint();
-                fieldBreakpointInfo.getField().addFieldBreakpointInfo(fieldBreakpointInfo);
+                eventListener.addFieldRequest(fieldBreakpointInfo);
                 String location = fieldBreakpointInfo.getKlass().getNameAsString() + "." + fieldBreakpointInfo.getField().getNameAsString();
                 controller.fine(() -> "Submitting field access breakpoint: " + location);
                 break;
             case FIELD_MODIFICATION:
                 fieldBreakpointInfo = (FieldBreakpointInfo) filter.getBreakpointInfo();
                 fieldBreakpointInfo.addSuspendPolicy(suspendPolicy);
                 fieldBreakpointInfo.setModificationBreakpoint();
-                fieldBreakpointInfo.getField().addFieldBreakpointInfo(fieldBreakpointInfo);
+                eventListener.addFieldRequest(fieldBreakpointInfo);
                 location = fieldBreakpointInfo.getKlass().getNameAsString() + "." + fieldBreakpointInfo.getField().getNameAsString();
                 controller.fine(() -> "Submitting field modification breakpoint: " + location);
                 break;
@@ -338,7 +338,7 @@ public CommandResult clearRequest(Packet packet) {
                     case FIELD_ACCESS:
                     case FIELD_MODIFICATION:
                         FieldBreakpointInfo info = (FieldBreakpointInfo) requestFilter.getBreakpointInfo();
-                        info.getField().removeFieldBreakpointInfo(requestFilter.getRequestId());
+                        eventListener.removeFieldRequest(info.getRequestId(), info.getField());
                         break;
                     case CLASS_PREPARE:
                         eventListener.removeClassPrepareRequest(requestFilter.getRequestId());
@@ -378,7 +378,7 @@ public CommandResult clearRequest(Packet packet) {
         return new CommandResult(reply);
     }
 
-    public CommandResult clearAllRequests(Packet packet) {
+    public CommandResult clearAllBreakpointRequests(Packet packet) {
         PacketStream reply = new PacketStream().id(packet.id).replyPacket();
 
         eventListener.clearAllBreakpointRequests();