unecessary source member

Author: eronnen

lldb/tools/lldb-dap/DAP.cpp

@@ -1650,7 +1650,7 @@ std::vector<protocol::Breakpoint> DAP::SetSourceBreakpoints(
   SourceBreakpointMap request_breakpoints;
   if (breakpoints) {
     for (const auto &bp : *breakpoints) {
-      SourceBreakpoint src_bp(*this, bp, source);
+      SourceBreakpoint src_bp(*this, bp);
       std::pair<uint32_t, uint32_t> bp_pos(src_bp.GetLine(),
                                            src_bp.GetColumn());
       request_breakpoints.try_emplace(bp_pos, src_bp);
@@ -1659,7 +1659,7 @@ std::vector<protocol::Breakpoint> DAP::SetSourceBreakpoints(
           existing_breakpoints.try_emplace(bp_pos, src_bp);
       // We check if this breakpoint already exists to update it.
       if (inserted)
-        iv->second.SetBreakpoint();
+        iv->second.SetBreakpoint(source);
       else
         iv->second.UpdateBreakpoint(src_bp);
 

lldb/tools/lldb-dap/SourceBreakpoint.cpp

@@ -29,23 +29,22 @@
 namespace lldb_dap {
 
 SourceBreakpoint::SourceBreakpoint(DAP &dap,
-                                   const protocol::SourceBreakpoint &breakpoint,
-                                   const protocol::Source &source)
+                                   const protocol::SourceBreakpoint &breakpoint)
     : Breakpoint(dap, breakpoint.condition, breakpoint.hitCondition),
-      m_log_message(breakpoint.logMessage.value_or("")), m_source(source),
+      m_log_message(breakpoint.logMessage.value_or("")),
       m_line(breakpoint.line),
       m_column(breakpoint.column.value_or(LLDB_INVALID_COLUMN_NUMBER)) {}
 
-void SourceBreakpoint::SetBreakpoint() {
+void SourceBreakpoint::SetBreakpoint(const protocol::Source &source) {
   lldb::SBMutex lock = m_dap.GetAPIMutex();
   std::lock_guard<lldb::SBMutex> guard(lock);
 
   if (m_line == 0)
     return;
 
-  if (m_source.sourceReference) {
+  if (source.sourceReference) {
     // breakpoint set by assembly source.
-    lldb::SBAddress source_address(*m_source.sourceReference, m_dap.target);
+    lldb::SBAddress source_address(*source.sourceReference, m_dap.target);
     if (!source_address.IsValid())
       return;
 
@@ -66,7 +65,7 @@ void SourceBreakpoint::SetBreakpoint() {
     m_bp = m_dap.target.BreakpointCreateBySBAddress(address);
   } else {
     // breakpoint set by a regular source file.
-    const auto source_path = m_source.path.value_or("");
+    const auto source_path = source.path.value_or("");
     lldb::SBFileSpecList module_list;
     m_bp = m_dap.target.BreakpointCreateByLocation(source_path.c_str(), m_line,
                                                    m_column, 0, module_list);

lldb/tools/lldb-dap/SourceBreakpoint.h

@@ -22,11 +22,10 @@ namespace lldb_dap {
 
 class SourceBreakpoint : public Breakpoint {
 public:
-  SourceBreakpoint(DAP &d, const protocol::SourceBreakpoint &breakpoint,
-                   const protocol::Source &source);
+  SourceBreakpoint(DAP &d, const protocol::SourceBreakpoint &breakpoint);
 
   // Set this breakpoint in LLDB as a new breakpoint
-  void SetBreakpoint();
+  void SetBreakpoint(const protocol::Source &source);
   void UpdateBreakpoint(const SourceBreakpoint &request_bp);
 
   void SetLogMessage();
@@ -63,7 +62,6 @@ class SourceBreakpoint : public Breakpoint {
   std::string m_log_message;
   std::vector<LogMessagePart> m_log_message_parts;
 
-  protocol::Source m_source; /// The original breakpoint source.
   uint32_t m_line;   ///< The source line of the breakpoint or logpoint
   uint32_t m_column; ///< An optional source column of the breakpoint
 };