use existing SBTarget::ResolveSymbolContextForAddress instead of adding new API

Author: eronnen

lldb/include/lldb/API/SBAddress.h

@@ -11,7 +11,6 @@
 
 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBModule.h"
-#include "lldb/API/SBTarget.h"
 
 namespace lldb {
 
@@ -59,12 +58,6 @@ class LLDB_API SBAddress {
   // "lldb::SBAddress SBTarget::ResolveLoadAddress (...)".
   lldb::SBSymbolContext GetSymbolContext(uint32_t resolve_scope);
 
-  /// Same as the previous function, but uses the given target in the symbol
-  /// context. This can help to resolve things that require the target,
-  // for example it's necessary in order to apply source map on SBLineEntry.
-  lldb::SBSymbolContext GetSymbolContext(const SBTarget &target,
-                                         uint32_t resolve_scope);
-
   // The following functions grab individual objects for a given address and
   // are less efficient if you want more than one symbol related objects. Use
   // one of the following when you want multiple debug symbol related objects
@@ -129,9 +122,6 @@ class LLDB_API SBAddress {
 
   void SetAddress(const lldb_private::Address &address);
 
-  void CalculateSymbolContext(lldb_private::SymbolContext &sc,
-                              uint32_t resolve_scope);
-
 private:
   std::unique_ptr<lldb_private::Address> m_opaque_up;
 };

lldb/source/API/SBAddress.cpp

@@ -213,18 +213,9 @@ SBSymbolContext SBAddress::GetSymbolContext(uint32_t resolve_scope) {
   LLDB_INSTRUMENT_VA(this, resolve_scope);
 
   SBSymbolContext sb_sc;
-  CalculateSymbolContext(sb_sc.ref(), resolve_scope);
-  return sb_sc;
-}
-
-SBSymbolContext SBAddress::GetSymbolContext(const SBTarget &target,
-                                            uint32_t resolve_scope) {
-  LLDB_INSTRUMENT_VA(this, target, resolve_scope);
-
-  SBSymbolContext sb_sc;
-  lldb_private::SymbolContext &sc = sb_sc.ref();
-  sc.target_sp = target.GetSP();
-  CalculateSymbolContext(sc, resolve_scope);
+  SymbolContextItem scope = static_cast<SymbolContextItem>(resolve_scope);
+  if (m_opaque_up->IsValid())
+    m_opaque_up->CalculateSymbolContext(&sb_sc.ref(), scope);
   return sb_sc;
 }
 
@@ -275,10 +266,3 @@ SBLineEntry SBAddress::GetLineEntry() {
   }
   return sb_line_entry;
 }
-
-void SBAddress::CalculateSymbolContext(lldb_private::SymbolContext &sc,
-                                       uint32_t resolve_scope) {
-  SymbolContextItem scope = static_cast<SymbolContextItem>(resolve_scope);
-  if (m_opaque_up->IsValid())
-    m_opaque_up->CalculateSymbolContext(&sc, scope);
-}

lldb/source/API/SBTarget.cpp

@@ -636,14 +636,17 @@ SBTarget::ResolveSymbolContextForAddress(const SBAddress &addr,
                                          uint32_t resolve_scope) {
   LLDB_INSTRUMENT_VA(this, addr, resolve_scope);
 
-  SBSymbolContext sc;
+  SBSymbolContext sb_sc;
   SymbolContextItem scope = static_cast<SymbolContextItem>(resolve_scope);
   if (addr.IsValid()) {
-    if (TargetSP target_sp = GetSP())
+    if (TargetSP target_sp = GetSP()) {
+      lldb_private::SymbolContext &sc = sb_sc.ref();
+      sc.target_sp = target_sp;
       target_sp->GetImages().ResolveSymbolContextForAddress(addr.ref(), scope,
-                                                            sc.ref());
+                                                            sc);
+    }
   }
-  return sc;
+  return sb_sc;
 }
 
 size_t SBTarget::ReadMemory(const SBAddress addr, void *buf, size_t size,

lldb/tools/lldb-dap/LLDBUtils.cpp

@@ -255,7 +255,7 @@ std::string GetSBFileSpecPath(const lldb::SBFileSpec &file_spec) {
 lldb::SBLineEntry GetLineEntryForAddress(lldb::SBTarget &target,
                                          lldb::SBAddress &address) {
   lldb::SBSymbolContext sc =
-      address.GetSymbolContext(target, lldb::eSymbolContextLineEntry);
+      target.ResolveSymbolContextForAddress(address, lldb::eSymbolContextLineEntry);
   return sc.GetLineEntry();
 }