Plumb SymbolContext through to GetDisplayDemangledName

Author: kastiglione

lldb/include/lldb/Symbol/Function.h

@@ -537,7 +537,7 @@ class Function : public UserID, public SymbolContextScope {
 
   ConstString GetNameNoArguments(const SymbolContext *sc = nullptr) const;
 
-  ConstString GetDisplayName() const;
+  ConstString GetDisplayName(const SymbolContext *sc = nullptr) const;
 
   const Mangled &GetMangled() const { return m_mangled; }
 

lldb/include/lldb/Symbol/Symbol.h

@@ -130,7 +130,7 @@ class Symbol : public SymbolContextScope {
 
   ConstString GetNameNoArguments() const;
 
-  ConstString GetDisplayName() const;
+  ConstString GetDisplayName(const SymbolContext *sc = nullptr) const;
 
   uint32_t GetID() const { return m_uid; }
 

lldb/source/Symbol/Function.cpp

@@ -498,10 +498,10 @@ bool Function::IsTopLevelFunction() {
   return result;
 }
 
-ConstString Function::GetDisplayName() const {
+ConstString Function::GetDisplayName(const SymbolContext *sc) const {
   if (!m_mangled)
     return GetName();
-  return m_mangled.GetDisplayDemangledName();
+  return m_mangled.GetDisplayDemangledName(sc);
 }
 
 CompilerDeclContext Function::GetDeclContext() {

lldb/source/Symbol/Symbol.cpp

@@ -168,8 +168,8 @@ bool Symbol::ValueIsAddress() const {
   return (bool)m_addr_range.GetBaseAddress().GetSection();
 }
 
-ConstString Symbol::GetDisplayName() const {
-  return GetMangled().GetDisplayDemangledName();
+ConstString Symbol::GetDisplayName(const SymbolContext *sc) const {
+  return GetMangled().GetDisplayDemangledName(sc);
 }
 
 ConstString Symbol::GetReExportedSymbolName() const {

lldb/source/Symbol/SymbolContext.cpp

@@ -94,7 +94,7 @@ bool SymbolContext::DumpStopContext(Stream *s, ExecutionContextScope *exe_scope,
       if (!show_function_arguments)
         name = function->GetNameNoArguments(this);
       if (!name && show_function_display_name)
-        name = function->GetDisplayName();
+        name = function->GetDisplayName(this);
       if (!name)
         name = function->GetName(this);
       if (name)
@@ -169,7 +169,7 @@ bool SymbolContext::DumpStopContext(Stream *s, ExecutionContextScope *exe_scope,
         s->PutCString("symbol stub for: ");
       ConstString name;
       if (show_function_display_name)
-        name = symbol->GetDisplayName();
+        name = symbol->GetDisplayName(this);
       if (!name)
         name = symbol->GetName();
       name.Dump(s);