[lldb-dap] support moduleId in the stackTrace response

[woruyu]

Summary

This PR resolves #149316

[llvmbot]

@llvm/pr-subscribers-lldb

Author: woruyu (woruyu)

Changes

Summary

This PR resolves #149316

---

Full diff: https://github.com/llvm/llvm-project/pull/149774.diff

1 Files Affected:

• (modified) lldb/tools/lldb-dap/JSONUtils.cpp (+9)

diff --git a/lldb/tools/lldb-dap/JSONUtils.cpp b/lldb/tools/lldb-dap/JSONUtils.cpp
index 41ca29a405ac9..7abd9618cc71f 100644
--- a/lldb/tools/lldb-dap/JSONUtils.cpp
+++ b/lldb/tools/lldb-dap/JSONUtils.cpp
@@ -550,6 +550,15 @@ llvm::json::Value CreateStackFrame(DAP &dap, lldb::SBFrame &frame,
   if (frame.IsArtificial() || frame.IsHidden())
     object.try_emplace("presentationHint", "subtle");
 
+  lldb::SBModule module = frame.GetModule();
+  if (module.IsValid()) {
+    std::string uuid = module.GetUUIDString();
+    if (!uuid.empty())
+      object.try_emplace("moduleId", uuid);
+    else
+      object.try_emplace("moduleId", module.GetFileSpec().GetFilename());
+  }
+
   return llvm::json::Value(std::move(object));
 }
 

[woruyu]

@da-viper , I added moduleId to the stackTrace response where I think it fits, but I’m not very familiar with lldb-dap. Would appreciate feedback on whether this is the right place, and where a test should go—DAPTests.cpp, ProtocolTypesTest.cpp, or elsewhere? Also, is there a simple way to test this locally without a full frontend?

[github-actions]

✅ With the latest revision this PR passed the Python code formatter.

[da-viper]

where a test should go—DAPTests.cpp, ProtocolTypesTest.cpp, or elsewhere

It should go into TestDAP_stackTrace

llvm-project/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py

Lines 29 to 31 in e94bc16

	def verify_stackFrame(self, frame_idx, stackFrame):
	frame_name = self.get_dict_value(stackFrame, self.name_key_path)
	frame_source = self.get_dict_value(stackFrame, self.source_key_path)

Also, is there a simple way to test this locally without a full frontend?

Not that I am aware of, you can look at LLDB_DAP logs (you need to set a log path) when running the DAP adapter or looking at the logs in a failed test.

[da-viper]

You can either use the self.dap_server.get_modules and compare the uuid received with the one returned from the stacktrace request.
OR
send an evaluate request of image list --uuid --basename and regex parse the modules to get the uuid.