luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll back the cxxabi demangle _Z check

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-02-02 18:32:15 -06:00
parent b2180ae797
commit 8e7b4a953f
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/demangle/demangle_with_cxxabi.cpp
View File

@ -14,11 +14,12 @@
namespace cpptrace { namespace cpptrace {
namespace detail { namespace detail {
std::string demangle(const std::string& name) { std::string demangle(const std::string& name) {
// https://itanium-cxx-abi.github.io/cxx-abi/abi.html#demangler // TODO: Do a special check to ensure external names start with _Z?
// check both _Z and __Z, apple prefixes all symbols with an underscore // // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#demangler
if(!(starts_with(name, "_Z") || starts_with(name, "__Z"))) { // // check both _Z and __Z, apple prefixes all symbols with an underscore
return name; // if(!(starts_with(name, "_Z") || starts_with(name, "__Z"))) {
} // return name;
// }
// Apple clang demangles __Z just fine but gcc doesn't, so just offset the leading underscore // Apple clang demangles __Z just fine but gcc doesn't, so just offset the leading underscore
std::size_t offset = 0; std::size_t offset = 0;
if(starts_with(name, "__Z")) { if(starts_with(name, "__Z")) {