Fixed a case where Mangled::GetName(...) could return a invalid demangled name when one could be calculated.
llvm-svn: 113900
This commit is contained in:
parent
8742543591
commit
d0b89f8cc2
|
@ -218,17 +218,17 @@ Mangled::GetName (Mangled::NamePreference preference) const
|
|||
{
|
||||
if (preference == ePreferDemangled)
|
||||
{
|
||||
const ConstString& name = GetDemangledName();
|
||||
if (name && !name.IsEmpty())
|
||||
return name;
|
||||
// Call the accessor to make sure we get a demangled name in case
|
||||
// it hasn't been demangled yet...
|
||||
if (GetDemangledName())
|
||||
return m_demangled;
|
||||
return m_mangled;
|
||||
}
|
||||
else
|
||||
{
|
||||
const ConstString& name = GetMangledName();
|
||||
if (name && !name.IsEmpty())
|
||||
return name;
|
||||
return m_demangled;
|
||||
if (m_mangled)
|
||||
return m_mangled;
|
||||
return GetDemangledName();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue