From 51019244abe20e51f4185c8d1e9f4b03e2ecde99 Mon Sep 17 00:00:00 2001 From: Francis Ricci Date: Thu, 6 Oct 2016 20:41:11 +0000 Subject: [PATCH] Fix GetDisplayName when only a demangled name is available Summary: GetDisplayDemangledName will already return a ConstString() when there is neither a mangled name or a demangled name, so we don't need to special case here. This will fix GetDisplayName in cases where m_mangled contains only a demangled name and not a mangled name. Reviewers: clayborg, granata.enrico, sas Subscribers: lldb-commits Differential Revision: https://reviews.llvm.org/D25201 llvm-svn: 283491 --- lldb/source/Symbol/Function.cpp | 2 -- lldb/source/Symbol/Symbol.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/lldb/source/Symbol/Function.cpp b/lldb/source/Symbol/Function.cpp index 9634616..8fde0a4 100644 --- a/lldb/source/Symbol/Function.cpp +++ b/lldb/source/Symbol/Function.cpp @@ -347,8 +347,6 @@ bool Function::IsTopLevelFunction() { } ConstString Function::GetDisplayName() const { - if (!m_mangled) - return ConstString(); return m_mangled.GetDisplayDemangledName(GetLanguage()); } diff --git a/lldb/source/Symbol/Symbol.cpp b/lldb/source/Symbol/Symbol.cpp index 623930c..d243657 100644 --- a/lldb/source/Symbol/Symbol.cpp +++ b/lldb/source/Symbol/Symbol.cpp @@ -117,8 +117,6 @@ bool Symbol::ValueIsAddress() const { } ConstString Symbol::GetDisplayName() const { - if (!m_mangled) - return ConstString(); return m_mangled.GetDisplayDemangledName(GetLanguage()); } -- 2.7.4