ardour/livetrax
13
0
Fork 0
Code

C++ demangnling: make it work on macOS as well as linux

Browse Source
This commit is contained in:
Paul Davis 2024-11-10 22:02:26 -07:00
parent 2e4f0e8181
commit b8e1f67b75
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libs/pbd/demangle.cc
View File

@ -19,21 +19,28 @@
#include "pbd/demangle.h" #include "pbd/demangle.h"
#if defined(__GLIBCXX__) #if defined(__GLIBCXX__) || defined(__APPLE__)
#include <cxxabi.h> #include <cxxabi.h>
#endif #endif
#ifdef __APPLE__
#include <sstream>
#endif
std::string std::string
PBD::demangle_symbol (const std::string& mangled_symbol) PBD::demangle_symbol (const std::string& mangled_symbol)
{ {
#if defined(__GLIBCXX__) #if defined(__GLIBCXX__) || defined(__APPLE__)
try { try {
int status; int status;
char* realname = abi::__cxa_demangle (mangled_symbol.c_str(), 0, 0, &status); char* realname = abi::__cxa_demangle (mangled_symbol.c_str(), 0, 0, &status);
std::string demangled_symbol (realname); if (!status) {
free (realname); std::string demangled_symbol (realname);
return demangled_symbol; free (realname);
return demangled_symbol;
}
return mangled_symbol;
} catch (...) { } catch (...) {
/* may happen if realname == NULL */ /* may happen if realname == NULL */
} }
@ -50,6 +57,29 @@ PBD::demangle_symbol (const std::string& mangled_symbol)
std::string std::string
PBD::demangle (std::string const& str) PBD::demangle (std::string const& str)
{ {
#ifdef __APPLE__
std::string foo;
std::string symbol;
std::stringstream sstr (str);
/* format is:
[ DIGITS LIBRARY_NAME ADDRESS SYMBOL OFFSET ]
We just need symbol. If this was speed-critical code, we'd likely
use C style code to get symbol, but it's not.
*/
sstr >> foo;
sstr >> foo;
sstr >> foo;
sstr >> symbol;
return demangle_symbol (symbol);
#else
std::string::size_type const b = str.find_first_of ("("); std::string::size_type const b = str.find_first_of ("(");
if (b == std::string::npos) { if (b == std::string::npos) {
@ -68,4 +98,5 @@ PBD::demangle (std::string const& str)
std::string const symbol = str.substr (b + 1, p - b - 1); std::string const symbol = str.substr (b + 1, p - b - 1);
return demangle_symbol (symbol); return demangle_symbol (symbol);
#endif
} }