maintain a map of resolved breakpoints

Author: eronnen

lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py

@@ -166,7 +166,7 @@ def __init__(
         self.initialized = False
         self.frame_scopes = {}
         self.init_commands = init_commands
-        self.resolved_breakpoints = set([])
+        self.resolved_breakpoints = {}
 
     @classmethod
     def encode_content(cls, s: str) -> bytes:
@@ -297,6 +297,9 @@ def _handle_recv_packet(self, packet: Optional[ProtocolMessage]) -> bool:
                 # and 'progressEnd' events. Keep these around in case test
                 # cases want to verify them.
                 self.progress_events.append(packet)
+            elif event == "breakpoint":
+                # Breakpoint events are sent when a breakpoint is resolved
+                self._update_verified_breakpoints([body["breakpoint"]])
 
         elif packet_type == "response":
             if packet["command"] == "disconnect":
@@ -310,13 +313,11 @@ def _process_continued(self, all_threads_continued: bool):
         if all_threads_continued:
             self.thread_stop_reasons = {}
 
-    def _update_verified_breakpoints(self, breakpoints):
+    def _update_verified_breakpoints(self, breakpoints: list[Event]):
         for breakpoint in breakpoints:
-            if "verified" in breakpoint:
-                if breakpoint["verified"]:
-                    self.resolved_breakpoints.add(str(breakpoint["id"]))
-                else:
-                    self.resolved_breakpoints.discard(str(breakpoint["id"]))
+            self.resolved_breakpoints[str(breakpoint["id"])] = breakpoint.get(
+                "verified", False
+            )
 
     def send_packet(self, command_dict: Request, set_sequence=True):
         """Take the "command_dict" python dictionary and encode it as a JSON
@@ -462,25 +463,18 @@ def wait_for_breakpoint_events(self, timeout: Optional[float] = None):
                 break
             breakpoint_events.append(event)
 
-        self._update_verified_breakpoints(
-            [event["body"]["breakpoint"] for event in breakpoint_events]
-        )
         return breakpoint_events
 
     def wait_for_breakpoints_to_be_verified(
         self, breakpoint_ids: list[str], timeout: Optional[float] = None
     ):
         """Wait for all breakpoints to be verified. Return all unverified breakpoints."""
-        unresolved_breakpoints = set(breakpoint_ids)
-        unresolved_breakpoints -= self.resolved_breakpoints
-        while len(unresolved_breakpoints) > 0:
+        while any(id not in self.resolved_breakpoints for id in breakpoint_ids):
             breakpoint_event = self.wait_for_event("breakpoint", timeout=timeout)
             if breakpoint_event is None:
                 break
 
-            self._update_verified_breakpoints([breakpoint_event["body"]["breakpoint"]])
-            unresolved_breakpoints -= self.resolved_breakpoints
-        return unresolved_breakpoints
+        return [id for id in breakpoint_ids if id not in self.resolved_breakpoints]
 
     def wait_for_exited(self, timeout: Optional[float] = None):
         event_dict = self.wait_for_event("exited", timeout=timeout)
@@ -1042,8 +1036,8 @@ def request_setBreakpoints(self, source: Source, line_array, data=None):
             "arguments": args_dict,
         }
         response = self.send_recv(command_dict)
-        breakpoints = response["body"]["breakpoints"]
-        self._update_verified_breakpoints(breakpoints)
+        if response["success"]:
+            self._update_verified_breakpoints(response["body"]["breakpoints"])
         return response
 
     def request_setExceptionBreakpoints(self, filters):
@@ -1071,8 +1065,8 @@ def request_setFunctionBreakpoints(self, names, condition=None, hitCondition=Non
             "arguments": args_dict,
         }
         response = self.send_recv(command_dict)
-        breakpoints = response["body"]["breakpoints"]
-        self._update_verified_breakpoints(breakpoints)
+        if response["success"]:
+            self._update_verified_breakpoints(response["body"]["breakpoints"])
         return response
 
     def request_dataBreakpointInfo(