<div dir="ltr">Just curious, is this related to the dump I sent you a while back?</div><br><div class="gmail_quote"><div dir="ltr">On Thu, May 26, 2016 at 5:23 PM Greg Clayton via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: gclayton<br>
Date: Thu May 26 19:17:18 2016<br>
New Revision: 270941<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=270941&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=270941&view=rev</a><br>
Log:<br>
Add a new "lldb" log channel named "demangle". If we have crashes that are related to demangling, we now can enable this logging and we will be able to reproduce demangler crashes (usually due to overflowing the stack) without needing someone's project.<br>
<br>
<rdar://problem/25221899><br>
<br>
Modified:<br>
lldb/trunk/include/lldb/Core/Logging.h<br>
lldb/trunk/source/Core/Logging.cpp<br>
lldb/trunk/source/Core/Mangled.cpp<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Logging.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Logging.h?rev=270941&r1=270940&r2=270941&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Logging.h?rev=270941&r1=270940&r2=270941&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Logging.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Logging.h Thu May 26 19:17:18 2016<br>
@@ -49,6 +49,7 @@<br>
#define LIBLLDB_LOG_JIT_LOADER (1u << 27)<br>
#define LIBLLDB_LOG_LANGUAGE (1u << 28)<br>
#define LIBLLDB_LOG_DATAFORMATTERS (1u << 29)<br>
+#define LIBLLDB_LOG_DEMANGLE (1u << 30)<br>
#define LIBLLDB_LOG_ALL (UINT32_MAX)<br>
#define LIBLLDB_LOG_DEFAULT (LIBLLDB_LOG_PROCESS |\<br>
LIBLLDB_LOG_THREAD |\<br>
<br>
Modified: lldb/trunk/source/Core/Logging.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Logging.cpp?rev=270941&r1=270940&r2=270941&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Logging.cpp?rev=270941&r1=270940&r2=270941&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Core/Logging.cpp (original)<br>
+++ lldb/trunk/source/Core/Logging.cpp Thu May 26 19:17:18 2016<br>
@@ -150,6 +150,7 @@ lldb_private::DisableLog (const char **c<br>
else if (0 == ::strcasecmp(arg, "jit")) flag_bits &= ~LIBLLDB_LOG_JIT_LOADER;<br>
else if (0 == ::strcasecmp(arg, "language")) flag_bits &= ~LIBLLDB_LOG_LANGUAGE;<br>
else if (0 == ::strncasecmp(arg, "formatters", 10)) flag_bits &= ~LIBLLDB_LOG_DATAFORMATTERS;<br>
+ else if (0 == ::strncasecmp(arg, "demangle", 8)) flag_bits &= ~LIBLLDB_LOG_DEMANGLE;<br>
else<br>
{<br>
feedback_strm->Printf ("error: unrecognized log category '%s'\n", arg);<br>
@@ -225,6 +226,7 @@ lldb_private::EnableLog (StreamSP &log_s<br>
else if (0 == ::strcasecmp(arg, "jit")) flag_bits |= LIBLLDB_LOG_JIT_LOADER;<br>
else if (0 == ::strcasecmp(arg, "language")) flag_bits |= LIBLLDB_LOG_LANGUAGE;<br>
else if (0 == ::strncasecmp(arg, "formatters", 10)) flag_bits |= LIBLLDB_LOG_DATAFORMATTERS;<br>
+ else if (0 == ::strncasecmp(arg, "demangle", 8)) flag_bits |= LIBLLDB_LOG_DEMANGLE;<br>
else<br>
{<br>
feedback_strm->Printf("error: unrecognized log category '%s'\n", arg);<br>
@@ -251,6 +253,7 @@ lldb_private::ListLogCategories (Stream<br>
" communication - log communication activities\n"<br>
" connection - log connection details\n"<br>
" default - enable the default set of logging categories for liblldb\n"<br>
+ " demangle - log mangled names to catch demangler crashes\n"<br>
" dyld - log shared library related activities\n"<br>
" events - log broadcaster, listener and event queue activities\n"<br>
" expr - log expressions\n"<br>
<br>
Modified: lldb/trunk/source/Core/Mangled.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Mangled.cpp?rev=270941&r1=270940&r2=270941&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Mangled.cpp?rev=270941&r1=270940&r2=270941&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Core/Mangled.cpp (original)<br>
+++ lldb/trunk/source/Core/Mangled.cpp Thu May 26 19:17:18 2016<br>
@@ -34,6 +34,8 @@<br>
#include "llvm/ADT/DenseMap.h"<br>
<br>
#include "lldb/Core/ConstString.h"<br>
+#include "lldb/Core/Log.h"<br>
+#include "lldb/Core/Logging.h"<br>
#include "lldb/Core/Mangled.h"<br>
#include "lldb/Core/RegularExpression.h"<br>
#include "lldb/Core/Stream.h"<br>
@@ -271,6 +273,8 @@ Mangled::GetDemangledName (lldb::Languag<br>
"Mangled::GetDemangledName (m_mangled = %s)",<br>
m_mangled.GetCString());<br>
<br>
+ Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_DEMANGLE);<br>
+<br>
// Don't bother running anything that isn't mangled<br>
const char *mangled_name = m_mangled.GetCString();<br>
ManglingScheme mangling_scheme{cstring_mangling_scheme(mangled_name)};<br>
@@ -285,6 +289,8 @@ Mangled::GetDemangledName (lldb::Languag<br>
case eManglingSchemeMSVC:<br>
{<br>
#if defined(_MSC_VER)<br>
+ if (log)<br>
+ log->Printf("demangle msvc: %s", mangled_name);<br>
const size_t demangled_length = 2048;<br>
demangled_name = static_cast<char *>(::malloc(demangled_length));<br>
::ZeroMemory(demangled_name, demangled_length);<br>
@@ -295,6 +301,14 @@ Mangled::GetDemangledName (lldb::Languag<br>
UNDNAME_NO_MEMBER_TYPE | // Strip virtual, static, etc specifiers<br>
UNDNAME_NO_MS_KEYWORDS // Strip all MS extension keywords<br>
);<br>
+ if (log)<br>
+ {<br>
+ if (demangled_name && demangled_name[0])<br>
+ log->Printf("demangled msvc: %s -> \"%s\"", mangled_name, demangled_name);<br>
+ else<br>
+ log->Printf("demangled msvc: %s -> error: 0x%" PRIx64, mangled_name, result);<br>
+ }<br>
+<br>
if (result == 0)<br>
{<br>
free(demangled_name);<br>
@@ -306,6 +320,8 @@ Mangled::GetDemangledName (lldb::Languag<br>
case eManglingSchemeItanium:<br>
{<br>
#ifdef LLDB_USE_BUILTIN_DEMANGLER<br>
+ if (log)<br>
+ log->Printf("demangle itanium: %s", mangled_name);<br>
// Try to use the fast-path demangler first for the<br>
// performance win, falling back to the full demangler only<br>
// when necessary<br>
@@ -315,6 +331,13 @@ Mangled::GetDemangledName (lldb::Languag<br>
#else<br>
demangled_name = abi::__cxa_demangle(mangled_name, NULL, NULL, NULL);<br>
#endif<br>
+ if (log)<br>
+ {<br>
+ if (demangled_name)<br>
+ log->Printf("demangled itanium: %s -> \"%s\"", mangled_name, demangled_name);<br>
+ else<br>
+ log->Printf("demangled itanium: %s -> error: failed to demangle", mangled_name);<br>
+ }<br>
break;<br>
}<br>
case eManglingSchemeNone:<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>