Skip to content
Snippets Groups Projects
Commit 1c4decad authored by Graham Linden's avatar Graham Linden
Browse files

Disable name demangling via libc++abi on OS X to avoid malloc abort trap on OS X 10.14 Mojave

parent 40d4e8b2
No related branches found
No related tags found
No related merge requests found
...@@ -247,6 +247,13 @@ namespace LLError ...@@ -247,6 +247,13 @@ namespace LLError
{ {
std::string Log::demangle(const char* mangled) std::string Log::demangle(const char* mangled)
{ {
#if LL_DARWIN
// MAINT-8724 libc++abi demangling causes malloc check failures
// that abort the application on OS X 10.14 Mojave so the easy
// fix is to disable demangling until a better fix can be found.
return mangled;
#else
#ifdef __GNUC__ #ifdef __GNUC__
// GCC: type_info::name() returns a mangled class name,st demangle // GCC: type_info::name() returns a mangled class name,st demangle
...@@ -282,6 +289,7 @@ namespace LLError ...@@ -282,6 +289,7 @@ namespace LLError
#else #else
return mangled; return mangled;
#endif
#endif #endif
} }
} // LLError } // LLError
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment