Support changed event too

Author: JDevlieghere

lldb/test/API/tools/lldb-dap/module/TestDAP_module.py

@@ -58,15 +58,25 @@ def checkSymbolsLoadedWithSize():
         self.assertIn("addressRange", program_module)
 
         # Collect all the module names we saw as events.
-        module_event_names = set()
+        module_new_names = []
+        module_changed_names = []
         for module_event in self.dap_server.module_events:
-            module_event_names.add(module_event["body"]["module"]["name"])
-        self.assertNotEqual(len(module_event_names), 0)
+            module_name = module_event["body"]["module"]["name"]
+            reason = module_event["body"]["reason"]
+            if reason == "new":
+                module_new_names.append(module_name)
+            elif reason == "changed":
+                module_changed_names.append(module_name)
 
         # Make sure we got an event for every active module.
+        self.assertNotEqual(len(module_new_names), 0)
         for module in active_modules:
-            # assertIn doesn't work with set.
-            self.assertTrue(module in module_event_names)
+            self.assertIn(module, module_new_names)
+
+        # Make sure we got an update event for the program module when the
+        # symbols got added.
+        self.assertNotEqual(len(module_changed_names), 0)
+        self.assertIn(program_module["name"], module_changed_names)
 
     @skipIfWindows
     def test_modules(self):

lldb/tools/lldb-dap/DAP.cpp

@@ -694,7 +694,9 @@ void DAP::SetTarget(const lldb::SBTarget target) {
         this->target.GetBroadcaster(),
         lldb::SBTarget::eBroadcastBitBreakpointChanged |
             lldb::SBTarget::eBroadcastBitModulesLoaded |
-            lldb::SBTarget::eBroadcastBitModulesUnloaded);
+            lldb::SBTarget::eBroadcastBitModulesUnloaded |
+            lldb::SBTarget::eBroadcastBitSymbolsLoaded |
+            lldb::SBTarget::eBroadcastBitSymbolsChanged);
     listener.StartListeningForEvents(this->broadcaster,
                                      eBroadcastBitStopEventThread);
   }

lldb/tools/lldb-dap/Handler/InitializeRequestHandler.cpp

@@ -110,6 +110,16 @@ void ProgressEventThreadFunction(DAP &dap) {
   }
 }
 
+static llvm::StringRef GetModuleEventReason(uint32_t event_mask) {
+  if (event_mask & lldb::SBTarget::eBroadcastBitModulesLoaded)
+    return "new";
+  if (event_mask & lldb::SBTarget::eBroadcastBitModulesUnloaded)
+    return "removed";
+  assert(event_mask & lldb::SBTarget::eBroadcastBitSymbolsLoaded ||
+         event_mask & lldb::SBTarget::eBroadcastBitSymbolsChanged);
+  return "changed";
+}
+
 // All events from the debugger, target, process, thread and frames are
 // received in this function that runs in its own thread. We are using a
 // "FILE *" to output packets back to VS Code and they have mutexes in them
@@ -197,11 +207,10 @@ static void EventThreadFunction(DAP &dap) {
         }
       } else if (lldb::SBTarget::EventIsTargetEvent(event)) {
         if (event_mask & lldb::SBTarget::eBroadcastBitModulesLoaded ||
-            event_mask & lldb::SBTarget::eBroadcastBitModulesUnloaded) {
-          const llvm::StringRef reason =
-              event_mask & lldb::SBTarget::eBroadcastBitModulesLoaded
-                  ? "new"
-                  : "removed";
+            event_mask & lldb::SBTarget::eBroadcastBitModulesUnloaded ||
+            event_mask & lldb::SBTarget::eBroadcastBitSymbolsLoaded ||
+            event_mask & lldb::SBTarget::eBroadcastBitSymbolsChanged) {
+          llvm::StringRef reason = GetModuleEventReason(event_mask);
           const uint32_t num_modules = SBTarget::GetNumModulesFromEvent(event);
           for (uint32_t i = 0; i < num_modules; ++i) {
             lldb::SBModule module =