Skip to content

Commit

Permalink
Back out "Temporarily disable stack traces for libc++ arm64"
Browse files Browse the repository at this point in the history
Summary:
As with all temporary solutions, this turned out to be a lot less
temporary than I was hoping for :D I was never able to figure out the
original issue, but we've since changed unwinders from libgcc to LLVM's
libunwind, and hopefully that fixes this issue as well.

Original commit changeset: 088c8a781d00

Original Phabricator Diff: D19718354 (501e6df)

Reviewed By: lanza

Differential Revision: D35133990

fbshipit-source-id: 8959891f1a8a7687be5786cb5c00c257cefdef36
  • Loading branch information
smeenai authored and facebook-github-bot committed Mar 25, 2022
1 parent 2554f9b commit de205a3
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions cxx/lyra/cxa_throw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,11 @@ void trace_destructor(void* exception_obj) {

[[noreturn]] void
cxa_throw(void* obj, const std::type_info* type, destructor_type destructor) {
// TODO(T61689492): Re-enable Lyra stack traces for libc++ arm64
#if !defined(__aarch64__)
if (enableBacktraces.load(std::memory_order_relaxed)) {
std::lock_guard<std::mutex> lock(*get_exception_state_map_mutex());
get_exception_state_map()->emplace(
obj, ExceptionState{ExceptionTraceHolder(), destructor});
}
#endif

original_cxa_throw(obj, type, trace_destructor);
}
Expand Down

0 comments on commit de205a3

Please sign in to comment.