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

Fix trace generation for cpptrace exception objects on armv7hf (#138)

Browse Source 
noexcept on get_raw_trace_and_absorb seems to somehow interfere with
unwinding on armv7hf, possibly due to unwind tables not being generated
for the function. Fixes #134.
This commit is contained in:
Jeremy Rifkin 2024-06-13 11:17:44 -05:00 committed by GitHub
parent 7543677d6f
commit 2fb0a6fd2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/cpptrace/cpptrace.hpp
View File

@ -302,8 +302,8 @@ namespace cpptrace {
void clear(); void clear();
}; };
CPPTRACE_EXPORT raw_trace get_raw_trace_and_absorb(std::size_t skip, std::size_t max_depth) noexcept; CPPTRACE_EXPORT raw_trace get_raw_trace_and_absorb(std::size_t skip, std::size_t max_depth);
CPPTRACE_EXPORT raw_trace get_raw_trace_and_absorb(std::size_t skip = 0) noexcept; CPPTRACE_EXPORT raw_trace get_raw_trace_and_absorb(std::size_t skip = 0);
} }
// Interface for a traced exception object // Interface for a traced exception object
@ -323,7 +323,7 @@ namespace cpptrace {
public: public:
explicit lazy_exception( explicit lazy_exception(
raw_trace&& trace = detail::get_raw_trace_and_absorb() raw_trace&& trace = detail::get_raw_trace_and_absorb()
) noexcept : trace_holder(std::move(trace)) {} ) : trace_holder(std::move(trace)) {}
// std::exception // std::exception
const char* what() const noexcept override; const char* what() const noexcept override;
// cpptrace::exception // cpptrace::exception

4
src/cpptrace.cpp
View File

@ -457,7 +457,7 @@ namespace cpptrace {
} }
CPPTRACE_FORCE_NO_INLINE CPPTRACE_FORCE_NO_INLINE
raw_trace get_raw_trace_and_absorb(std::size_t skip, std::size_t max_depth) noexcept { raw_trace get_raw_trace_and_absorb(std::size_t skip, std::size_t max_depth) {
try { try {
return generate_raw_trace(skip + 1, max_depth); return generate_raw_trace(skip + 1, max_depth);
} catch(const std::exception& e) { } catch(const std::exception& e) {
@ -474,7 +474,7 @@ namespace cpptrace {
} }
CPPTRACE_FORCE_NO_INLINE CPPTRACE_FORCE_NO_INLINE
raw_trace get_raw_trace_and_absorb(std::size_t skip) noexcept { raw_trace get_raw_trace_and_absorb(std::size_t skip) {
return get_raw_trace_and_absorb(skip + 1, SIZE_MAX); return get_raw_trace_and_absorb(skip + 1, SIZE_MAX);
} }