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

Hopefully final ci fixes

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-01-28 12:53:40 -06:00
parent 82ef2287dd
commit 1429cfc429
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/demangle/demangle_with_cxxabi.cpp
View File

@ -1,3 +1,4 @@
#include "utils/microfmt.hpp"
#ifdef CPPTRACE_DEMANGLE_WITH_CXXABI #ifdef CPPTRACE_DEMANGLE_WITH_CXXABI
#include "demangle/demangle.hpp" #include "demangle/demangle.hpp"
@ -18,6 +19,11 @@ namespace detail {
if(!(starts_with(name, "_Z") || starts_with(name, "__Z"))) { if(!(starts_with(name, "_Z") || starts_with(name, "__Z"))) {
return name; return name;
} }
// Apple clang demangles __Z just fine but gcc doesn't, so just offset the leading underscore
std::size_t offset = 0;
if(starts_with(name, "__Z")) {
offset = 1;
}
// Mangled names don't have spaces, we might add a space and some extra info somewhere but we still want it to // Mangled names don't have spaces, we might add a space and some extra info somewhere but we still want it to
// be demanglable. Look for a space, if there is one swap it with a null terminator briefly. // be demanglable. Look for a space, if there is one swap it with a null terminator briefly.
auto end = name.find(' '); auto end = name.find(' ');
@ -33,7 +39,7 @@ namespace detail {
// it appears safe to pass nullptr for status however the docs don't explicitly say it's safe so I don't // it appears safe to pass nullptr for status however the docs don't explicitly say it's safe so I don't
// want to rely on it // want to rely on it
int status; int status;
char* const demangled = abi::__cxa_demangle(to_demangle.get().c_str(), nullptr, nullptr, &status); char* const demangled = abi::__cxa_demangle(to_demangle.get().c_str() + offset, nullptr, nullptr, &status);
// demangled will always be nullptr on non-zero status, and if __cxa_demangle ever fails for any reason // demangled will always be nullptr on non-zero status, and if __cxa_demangle ever fails for any reason
// we'll just quietly return the mangled name // we'll just quietly return the mangled name
if(demangled) { if(demangled) {

1
test/BUILD.bazel
View File

@ -7,6 +7,7 @@ cc_test(
], ],
srcs = [ srcs = [
"unit/main.cpp", "unit/main.cpp",
"unit/tracing/common.hpp",
"unit/tracing/raw_trace.cpp", "unit/tracing/raw_trace.cpp",
"unit/tracing/object_trace.cpp", "unit/tracing/object_trace.cpp",
"unit/tracing/stacktrace.cpp", "unit/tracing/stacktrace.cpp",