https://github.com/xujuntwt95329 updated
https://github.com/llvm/llvm-project/pull/73393
>From 4621be9af9a8003c52850ed57ae7a24f26769b2c Mon Sep 17 00:00:00 2001
From: Xu Jun <693788...@qq.com>
Date: Sat, 25 Nov 2023 22:52:53 +0800
Subject: [PATCH 1/2] [lldb][dap] always add column field in StackFrame body
Signed-off-by: Xu Jun <693788...@qq.com>
---
lldb/tools/lldb-dap/JSONUtils.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lldb/tools/lldb-dap/JSONUtils.cpp
b/lldb/tools/lldb-dap/JSONUtils.cpp
index 03a43f9da87f241..e65b05243df7066 100644
--- a/lldb/tools/lldb-dap/JSONUtils.cpp
+++ b/lldb/tools/lldb-dap/JSONUtils.cpp
@@ -817,8 +817,7 @@ llvm::json::Value CreateStackFrame(lldb::SBFrame &frame) {
if (line && line != LLDB_INVALID_LINE_NUMBER)
object.try_emplace("line", line);
auto column = line_entry.GetColumn();
- if (column && column != LLDB_INVALID_COLUMN_NUMBER)
- object.try_emplace("column", column);
+ object.try_emplace("column", column);
} else {
object.try_emplace("line", 0);
object.try_emplace("column", 0);
>From 2e2c7cd63d9855016e3dff99720188dc912bb64e Mon Sep 17 00:00:00 2001
From: Xu Jun <693788...@qq.com>
Date: Mon, 27 Nov 2023 06:25:17 +0000
Subject: [PATCH 2/2] [lldb][dap] always add line field in StackFrame body
---
lldb/tools/lldb-dap/JSONUtils.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lldb/tools/lldb-dap/JSONUtils.cpp
b/lldb/tools/lldb-dap/JSONUtils.cpp
index e65b05243df7066..d5edafccfedc3c6 100644
--- a/lldb/tools/lldb-dap/JSONUtils.cpp
+++ b/lldb/tools/lldb-dap/JSONUtils.cpp
@@ -816,6 +816,8 @@ llvm::json::Value CreateStackFrame(lldb::SBFrame &frame) {
auto line = line_entry.GetLine();
if (line && line != LLDB_INVALID_LINE_NUMBER)
object.try_emplace("line", line);
+ else
+ object.try_emplace("line", 0);
auto column = line_entry.GetColumn();
object.try_emplace("column", column);
} else {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
