create persistent breakpoints

Author: eronnen

lldb/include/lldb/API/SBTarget.h

@@ -737,6 +737,9 @@ class LLDB_API SBTarget {
 
   lldb::SBBreakpoint BreakpointCreateBySBAddress(SBAddress &address);
 
+  lldb::SBBreakpoint BreakpointCreateByFileAddress(const SBFileSpec &file_spec,
+                                                   addr_t file_addr);
+
   /// Create a breakpoint using a scripted resolver.
   ///
   /// \param[in] class_name

lldb/include/lldb/Target/Target.h

@@ -723,7 +723,7 @@ class Target : public std::enable_shared_from_this<Target>,
   lldb::BreakpointSP CreateBreakpoint(lldb::addr_t load_addr, bool internal,
                                       bool request_hardware);
 
-  // Use this to create a breakpoint from a load address and a module file spec
+  // Use this to create a breakpoint from a file address and a module file spec
   lldb::BreakpointSP CreateAddressInModuleBreakpoint(lldb::addr_t file_addr,
                                                      bool internal,
                                                      const FileSpec &file_spec,

lldb/source/API/SBTarget.cpp

@@ -66,6 +66,7 @@
 
 #include "Commands/CommandObjectBreakpoint.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
+#include "lldb/lldb-types.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Regex.h"
 
@@ -949,6 +950,19 @@ SBBreakpoint SBTarget::BreakpointCreateBySBAddress(SBAddress &sb_address) {
   return sb_bp;
 }
 
+SBBreakpoint SBTarget::BreakpointCreateByFileAddress(const SBFileSpec &file_spec, addr_t file_addr) {
+  LLDB_INSTRUMENT_VA(this, file_spec, file_addr);
+
+  SBBreakpoint sb_bp;
+  if (TargetSP target_sp = GetSP()) {
+    std::lock_guard<std::recursive_mutex> guard(target_sp->GetAPIMutex());
+    const bool hardware = false;
+    sb_bp = target_sp->CreateAddressInModuleBreakpoint(file_addr, false, *file_spec.get(), hardware);
+  }
+
+  return sb_bp;
+}
+
 lldb::SBBreakpoint
 SBTarget::BreakpointCreateBySourceRegex(const char *source_regex,
                                         const lldb::SBFileSpec &source_file,

lldb/tools/lldb-dap/Protocol/DAPTypes.cpp

@@ -9,13 +9,13 @@ bool fromJSON(const llvm::json::Value &Params, PersistenceData &PD,
               llvm::json::Path P) {
   json::ObjectMapper O(Params, P);
   return O && O.mapOptional("module", PD.module) &&
-         O.mapOptional("symbol_mangled_name", PD.symbol_mangled_name);
+         O.mapOptional("file_addr", PD.file_addr);
 }
 
 llvm::json::Value toJSON(const PersistenceData &PD) {
   json::Object result{
       {"module", PD.module},
-      {"symbol_mangled_name", PD.symbol_mangled_name},
+      {"file_addr", PD.file_addr},
   };
 
   return result;

lldb/tools/lldb-dap/Protocol/DAPTypes.h

@@ -31,8 +31,8 @@ struct PersistenceData {
   /// The source module path.
   std::string module;
 
-  /// The symbol unique name.
-  std::string symbol_mangled_name;
+  /// The file address inside the module.
+  lldb::addr_t file_addr;
 };
 bool fromJSON(const llvm::json::Value &, PersistenceData &,
               llvm::json::Path);

lldb/tools/lldb-dap/SourceBreakpoint.cpp

@@ -12,6 +12,7 @@
 #include "JSONUtils.h"
 #include "ProtocolUtils.h"
 #include "lldb/API/SBBreakpoint.h"
+#include "lldb/API/SBFileSpec.h"
 #include "lldb/API/SBFileSpecList.h"
 #include "lldb/API/SBFrame.h"
 #include "lldb/API/SBInstruction.h"
@@ -115,6 +116,8 @@ llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithSourceReference(int64_
 }
 
 llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithPersistenceData(const protocol::PersistenceData &persistence_data) {
+  lldb::SBFileSpec file_spec(persistence_data.module.c_str());
+  m_bp = m_dap.target.BreakpointCreateByFileAddress(file_spec, persistence_data.file_addr);
   return llvm::Error::success();
 }