commit ddaf6a7259a5f56431ca7889c912601e94d1ce20
author Greg Clayton <gclayton@apple.com> Wed Jul 08 22:32:23 2015 +0000
committer Greg Clayton <gclayton@apple.com> Wed Jul 08 22:32:23 2015 +0000
tree 670fc9ed2ab0780f98a2160253921fa4fb6859ab
parent 4104fe8ae92861d77b40adc78635915fbf6a1470

Make many mangled functions that might demangle a name be allowed to specify a language to use in order to soon support Pascal and Java demangling. Dawn Perchik will take care of making this so.

llvm-svn: 241751

lldb/source/Symbol/Function.cpp

diff --git a/lldb/source/Symbol/Function.cpp b/lldb/source/Symbol/Function.cpp
index 61b48ed..77448d4 100644
--- a/lldb/source/Symbol/Function.cpp
+++ b/lldb/source/Symbol/Function.cpp
@@ -77,7 +77,7 @@
     return m_declaration;
 }
 
-const ConstString&
+ConstString
 FunctionInfo::GetName() const
 {
     return m_name;
@@ -140,30 +140,30 @@
 }
 
 void
-InlineFunctionInfo::DumpStopContext (Stream *s) const
+InlineFunctionInfo::DumpStopContext (Stream *s, LanguageType language) const
 {
 //    s->Indent("[inlined] ");
     s->Indent();
     if (m_mangled)
-        s->PutCString (m_mangled.GetName().AsCString());
+        s->PutCString (m_mangled.GetName(language).AsCString());
     else
         s->PutCString (m_name.AsCString());
 }
 
 
-const ConstString &
-InlineFunctionInfo::GetName () const
+ConstString
+InlineFunctionInfo::GetName (LanguageType language) const
 {
     if (m_mangled)
-        return m_mangled.GetName();
+        return m_mangled.GetName(language);
     return m_name;
 }
 
 ConstString
-InlineFunctionInfo::GetDisplayName () const
+InlineFunctionInfo::GetDisplayName (LanguageType language) const
 {
     if (m_mangled)
-        return m_mangled.GetDisplayDemangledName();
+        return m_mangled.GetDisplayDemangledName(language);
     return m_name;
 }
 
@@ -471,7 +471,7 @@
 {
     if (!m_mangled)
         return ConstString();
-    return m_mangled.GetDisplayDemangledName();
+    return m_mangled.GetDisplayDemangledName(GetLanguage());
 }
 
 clang::DeclContext *
@@ -617,5 +617,32 @@
     return m_prologue_byte_size;
 }
 
+lldb::LanguageType
+Function::GetLanguage() const
+{
+    if (m_comp_unit)
+        return m_comp_unit->GetLanguage();
+    else
+        return lldb::eLanguageTypeUnknown;
+}
+
+ConstString
+Function::GetName() const
+{
+    LanguageType language = lldb::eLanguageTypeUnknown;
+    if (m_comp_unit)
+        language = m_comp_unit->GetLanguage();
+    return m_mangled.GetName(language);
+}
+
+ConstString
+Function::GetNameNoArguments() const
+{
+    LanguageType language = lldb::eLanguageTypeUnknown;
+    if (m_comp_unit)
+        language = m_comp_unit->GetLanguage();
+    return m_mangled.GetName(language, Mangled::ePreferDemangledWithoutArguments);
+}
+