Reverting some of the changes to the stopped event, I'll follow up with a new PR for that and improving the error reporting for the 'DisassembledInstruction' type.

Author: ashgti

lldb/test/API/tools/lldb-dap/threads/TestDAP_threads.py

@@ -33,7 +33,7 @@ def test_correct_thread(self):
         self.dap_server.request_continue()
         stopped_event = self.dap_server.wait_for_stopped()
         # Verify that the description is the relevant breakpoint,
-        # preserveFocusHint is False.
+        # preserveFocusHint is False and threadCausedFocus is True
         self.assertTrue(
             stopped_event[0]["body"]["description"].startswith(
                 "breakpoint %s." % breakpoint_ids[0]

lldb/tools/lldb-dap/EventHelper.cpp

@@ -151,7 +151,7 @@ llvm::Error SendThreadStoppedEvent(DAP &dap, bool on_entry) {
 
   llvm::DenseSet<lldb::tid_t> old_thread_ids;
   old_thread_ids.swap(dap.thread_ids);
-  uint32_t stop_id = on_entry ? 0 : process.GetStopID();
+  uint32_t stop_id = process.GetStopID();
   const uint32_t num_threads = process.GetNumThreads();
 
   // First make a pass through the threads to see if the focused thread

lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp

@@ -852,22 +852,20 @@ llvm::json::Value toJSON(const DisassembledInstruction::PresentationHint &PH) {
 
 bool fromJSON(const llvm::json::Value &Params, DisassembledInstruction &DI,
               llvm::json::Path P) {
-  std::optional<llvm::StringRef> raw_address =
-      Params.getAsObject()->getString("address");
-  if (!raw_address) {
-    P.report("missing 'address' field");
+  llvm::json::ObjectMapper O(Params, P);
+  std::string raw_address;
+  if (!O || !O.map("address", raw_address))
     return false;
-  }
 
-  std::optional<lldb::addr_t> address = DecodeMemoryReference(*raw_address);
+  std::optional<lldb::addr_t> address = DecodeMemoryReference(raw_address);
   if (!address) {
-    P.report("invalid 'address'");
+    P.field("address").report("expected string encoded uint64_t");
     return false;
   }
 
   DI.address = *address;
-  llvm::json::ObjectMapper O(Params, P);
-  return O && O.map("instruction", DI.instruction) &&
+
+  return O.map("instruction", DI.instruction) &&
          O.mapOptional("instructionBytes", DI.instructionBytes) &&
          O.mapOptional("symbol", DI.symbol) &&
          O.mapOptional("location", DI.location) &&

lldb/tools/lldb-dap/ProtocolUtils.cpp

@@ -152,7 +152,9 @@ std::vector<protocol::Thread> GetThreads(lldb::SBProcess process,
   std::lock_guard<lldb::SBMutex> guard(lock);
 
   std::vector<protocol::Thread> threads;
+
   const uint32_t num_threads = process.GetNumThreads();
+  threads.reserve(num_threads);
   for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
     lldb::SBThread thread = process.GetThreadAtIndex(thread_idx);
     threads.emplace_back(CreateThread(thread, format));

lldb/unittests/DAP/ProtocolTypesTest.cpp

@@ -618,8 +618,16 @@ TEST(ProtocolTypesTest, DisassembledInstruction) {
   EXPECT_THAT_EXPECTED(
       parse<DisassembledInstruction>(R"({"address":1})",
                                      "disassemblyInstruction"),
-      FailedWithMessage(
-          "missing 'address' field when parsing disassemblyInstruction"));
+      FailedWithMessage("expected string at disassemblyInstruction.address"));
+  EXPECT_THAT_EXPECTED(parse<DisassembledInstruction>(R"({"address":"-1"})",
+                                                      "disassemblyInstruction"),
+                       FailedWithMessage("expected string encoded uint64_t at "
+                                         "disassemblyInstruction.address"));
+  EXPECT_THAT_EXPECTED(parse<DisassembledInstruction>(
+                           R"({"address":"0xfffffffffffffffffffffffffff"})",
+                           "disassemblyInstruction"),
+                       FailedWithMessage("expected string encoded uint64_t at "
+                                         "disassemblyInstruction.address"));
 }
 
 TEST(ProtocolTypesTest, Thread) {
@@ -643,8 +651,7 @@ TEST(ProtocolTypesTest, Thread) {
 
 TEST(ProtocolTypesTest, ThreadResponseBody) {
   const ThreadsResponseBody body{{{1, "thr1"}, {2, "thr2"}}};
-  const StringRef json =
-      R"({
+  const StringRef json = R"({
   "threads": [
     {
       "id": 1,