diff options
| author | Zachary Turner <zturner@google.com> | 2015-01-14 18:34:43 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-01-14 18:34:43 +0000 |
| commit | a45fa2ccaa123d1e7a82f02705eb3e34d5dcac11 (patch) | |
| tree | fcb4bf1dd71ea30516392c969ba02499fb6dd3ed /lldb/source | |
| parent | e2dcbd001cadabbfbbf82aee2ee3f2eb3aeaeb09 (diff) | |
| download | bcm5719-llvm-a45fa2ccaa123d1e7a82f02705eb3e34d5dcac11.tar.gz bcm5719-llvm-a45fa2ccaa123d1e7a82f02705eb3e34d5dcac11.zip | |
Implement demangling on Windows.
llvm-svn: 226017
Diffstat (limited to 'lldb/source')
| -rw-r--r-- | lldb/source/Core/Mangled.cpp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/lldb/source/Core/Mangled.cpp b/lldb/source/Core/Mangled.cpp index c0ab66cd288..c9d0953648b 100644 --- a/lldb/source/Core/Mangled.cpp +++ b/lldb/source/Core/Mangled.cpp @@ -10,8 +10,9 @@ // FreeBSD9-STABLE requires this to know about size_t in cxxabi.h #include <cstddef> -#if defined(_MSC_VER) -// Cannot enable the builtin demangler on msvc as it does not support the cpp11 within the implementation. +#if defined(_MSC_VER) +#include "lldb/Host/windows/windows.h" +#include <Dbghelp.h> #elif defined (__FreeBSD__) #define LLDB_USE_BUILTIN_DEMANGLER #else @@ -4998,7 +4999,11 @@ static inline bool cstring_is_mangled (const char *s) { if (s) - return s[0] == '_' && s[1] == 'Z'; +#if defined(_MSC_VER) + return (s[0] == '?'); +#else + return (s[0] == '_' && s[1] == 'Z'); +#endif return false; } @@ -5226,17 +5231,27 @@ Mangled::GetDemangledName () const if (!demangled_name) demangled_name = __cxa_demangle (mangled_cstr, NULL, NULL, NULL); #elif defined(_MSC_VER) - // Cannot demangle on msvc. - char *demangled_name = nullptr; + char *demangled_name = (char *)::malloc(1024); + ::ZeroMemory(demangled_name, 1024); + DWORD result = ::UnDecorateSymbolName(mangled_cstr, demangled_name, 1023, + UNDNAME_NO_ACCESS_SPECIFIERS | // Strip public, private, protected keywords + UNDNAME_NO_ALLOCATION_LANGUAGE | // Strip __thiscall, __stdcall, etc keywords + UNDNAME_NO_THROW_SIGNATURES | // Strip throw() specifications + UNDNAME_NO_MEMBER_TYPE | // Strip virtual, static, etc specifiers + UNDNAME_NO_MS_KEYWORDS // Strip all MS extension keywords + ); + if (result > 0) + m_demangled.SetCStringWithMangledCounterpart(demangled_name, m_mangled); + free(demangled_name); #else char *demangled_name = abi::__cxa_demangle (mangled_cstr, NULL, NULL, NULL); -#endif if (demangled_name) { - m_demangled.SetCStringWithMangledCounterpart(demangled_name, m_mangled); + m_demangled.SetCStringWithMangledCounterpart(demangled_name, m_mangled); free (demangled_name); } +#endif } } if (!m_demangled) |
