[lldb-dap] move create createAssemblyReference to DAP.cpp

Author: da-viper

lldb/tools/lldb-dap/DAP.cpp

@@ -624,13 +624,8 @@ ReplMode DAP::DetectReplMode(lldb::SBFrame frame, std::string &expression,
 }
 
 std::optional<protocol::Source> DAP::ResolveSource(lldb::SBAddress address) {
-
-  if (DisplayAssemblySource(debugger, address)) {
-    auto create_reference = [this](lldb::addr_t addr) {
-      return CreateSourceReference(addr);
-    };
-    return CreateAssemblySource(target, address, create_reference);
-  }
+  if (DisplayAssemblySource(debugger, address))
+    return ResolveAssemblySource(address);
 
   lldb::SBLineEntry line_entry = GetLineEntryForAddress(target, address);
   if (!line_entry.IsValid())
@@ -639,6 +634,44 @@ std::optional<protocol::Source> DAP::ResolveSource(lldb::SBAddress address) {
   return CreateSource(line_entry.GetFileSpec());
 }
 
+std::optional<protocol::Source>
+DAP::ResolveAssemblySource(lldb::SBAddress address) {
+  lldb::SBSymbol symbol = address.GetSymbol();
+  lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
+  std::string name;
+  if (symbol.IsValid()) {
+    load_addr = symbol.GetStartAddress().GetLoadAddress(target);
+    name = symbol.GetName();
+  } else {
+    load_addr = address.GetLoadAddress(target);
+    name = GetLoadAddressString(load_addr);
+  }
+
+  if (load_addr == LLDB_INVALID_ADDRESS)
+    return std::nullopt;
+
+  protocol::Source source;
+  source.sourceReference = CreateSourceReference(load_addr);
+  lldb::SBModule module = address.GetModule();
+  if (module.IsValid()) {
+    lldb::SBFileSpec file_spec = module.GetFileSpec();
+    if (file_spec.IsValid()) {
+      std::string path = GetSBFileSpecPath(file_spec);
+      if (!path.empty())
+        source.path = path + '`' + name;
+    }
+  }
+
+  source.name = std::move(name);
+
+  // Mark the source as deemphasized since users will only be able to view
+  // assembly for these frames.
+  source.presentationHint =
+      protocol::Source::eSourcePresentationHintDeemphasize;
+
+  return source;
+}
+
 bool DAP::RunLLDBCommands(llvm::StringRef prefix,
                           llvm::ArrayRef<std::string> commands) {
   bool required_command_failed = false;

lldb/tools/lldb-dap/DAP.h

@@ -265,6 +265,18 @@ struct DAP {
   ///     definition outlined by Microsoft.
   std::optional<protocol::Source> ResolveSource(lldb::SBAddress address);
 
+  /// Create a "Source" JSON object as described in the debug adapter
+  /// definition.
+  ///
+  /// \param[in] address
+  ///     The address to use when populating out the "Source" object.
+  ///
+  /// \return
+  ///     An optional "Source" JSON object that follows the formal JSON
+  ///     definition outlined by Microsoft.
+  std::optional<protocol::Source>
+  ResolveAssemblySource(lldb::SBAddress address);
+
   /// \return
   ///   \b false if a fatal error was found while executing these commands,
   ///   according to the rules of \a LLDBUtils::RunLLDBCommands.

lldb/tools/lldb-dap/ProtocolUtils.cpp

@@ -46,46 +46,6 @@ static bool ShouldDisplayAssemblySource(
   return false;
 }
 
-std::optional<protocol::Source> CreateAssemblySource(
-    const lldb::SBTarget &target, lldb::SBAddress address,
-    llvm::function_ref<int32_t(lldb::addr_t)> create_reference) {
-
-  lldb::SBSymbol symbol = address.GetSymbol();
-  lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
-  std::string name;
-  if (symbol.IsValid()) {
-    load_addr = symbol.GetStartAddress().GetLoadAddress(target);
-    name = symbol.GetName();
-  } else {
-    load_addr = address.GetLoadAddress(target);
-    name = GetLoadAddressString(load_addr);
-  }
-
-  if (load_addr == LLDB_INVALID_ADDRESS)
-    return std::nullopt;
-
-  protocol::Source source;
-  source.sourceReference = create_reference(load_addr);
-  lldb::SBModule module = address.GetModule();
-  if (module.IsValid()) {
-    lldb::SBFileSpec file_spec = module.GetFileSpec();
-    if (file_spec.IsValid()) {
-      std::string path = GetSBFileSpecPath(file_spec);
-      if (!path.empty())
-        source.path = path + '`' + name;
-    }
-  }
-
-  source.name = std::move(name);
-
-  // Mark the source as deemphasized since users will only be able to view
-  // assembly for these frames.
-  source.presentationHint =
-      protocol::Source::PresentationHint::eSourcePresentationHintDeemphasize;
-
-  return source;
-}
-
 std::optional<protocol::Source> CreateSource(const lldb::SBFileSpec &file) {
   if (!file.IsValid())
     return std::nullopt;

lldb/tools/lldb-dap/ProtocolUtils.h

@@ -30,24 +30,6 @@ namespace lldb_dap {
 ///     definition outlined by Microsoft.
 std::optional<protocol::Source> CreateSource(const lldb::SBFileSpec &file);
 
-/// Create a "Source" JSON object as described in the debug adapter definition.
-///
-/// \param[in] target
-///     The target that has the address.
-///
-/// \param[in] address
-///     The address to use when populating out the "Source" object.
-///
-/// \param[in] create_reference
-///     function used to create a source_reference
-///
-/// \return
-///     An optional "Source" JSON object that follows the formal JSON
-///     definition outlined by Microsoft.
-std::optional<protocol::Source> CreateAssemblySource(
-    const lldb::SBTarget &target, lldb::SBAddress address,
-    llvm::function_ref<int32_t(lldb::addr_t)> create_reference);
-
 /// Checks if the given source is for assembly code.
 bool IsAssemblySource(const protocol::Source &source);