llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Walter Erquinigo (walter-erquinigo) <details> <summary>Changes</summary> Currently there's an include in which `[opt]` might be emitted twice if the frame format also asks for it. As a trivial fix, we should manually emit `[opt]` only if a custom frame format is not specified. --- Full diff: https://github.com/llvm/llvm-project/pull/74861.diff 1 Files Affected: - (modified) lldb/tools/lldb-dap/JSONUtils.cpp (+4-2) ``````````diff diff --git a/lldb/tools/lldb-dap/JSONUtils.cpp b/lldb/tools/lldb-dap/JSONUtils.cpp index 03a43f9da87f24..e55a69ecd0e9f2 100644 --- a/lldb/tools/lldb-dap/JSONUtils.cpp +++ b/lldb/tools/lldb-dap/JSONUtils.cpp @@ -803,9 +803,11 @@ llvm::json::Value CreateStackFrame(lldb::SBFrame &frame) { llvm::raw_string_ostream os(frame_name); os << llvm::format_hex(frame.GetPC(), 18); } - bool is_optimized = frame.GetFunction().GetIsOptimized(); - if (is_optimized) + + // We only include `[opt]` if a custom frame format is not specified. + if (!g_dap.frame_format && frame.GetFunction().GetIsOptimized()) frame_name += " [opt]"; + EmplaceSafeString(object, "name", frame_name); auto source = CreateSource(frame); `````````` </details> https://github.com/llvm/llvm-project/pull/74861 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
