Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

exception_tracer should support libc++ #2402

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

exception_tracer should support libc++ #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionAbi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <exception>
#include <typeinfo>

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#include <unwind.h>

Expand Down Expand Up @@ -60,4 +60,4 @@ __cxa_eh_globals* __cxa_get_globals_fast(void) noexcept;

} // namespace __cxxabiv1

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionCounterLib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

using namespace folly::exception_tracer;

Expand Down Expand Up @@ -145,6 +145,6 @@ Initializer initializer;

} // namespace

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionCounterLib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

namespace folly {
namespace exception_tracer {
Expand All @@ -46,6 +46,6 @@ std::ostream& operator<<(std::ostream& out, const ExceptionStats& stats);
} // namespace exception_tracer
} // namespace folly

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionStackTraceLib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

using namespace folly::exception_tracer;

Expand Down Expand Up @@ -123,6 +123,6 @@ Initializer initializer;

} // namespace

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionTracer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#include <dlfcn.h>

Expand Down Expand Up @@ -238,6 +238,6 @@ void installHandlers() {
} // namespace exception_tracer
} // namespace folly

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionTracerLib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <folly/SharedMutex.h>
#include <folly/Synchronized.h>

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#include <dlfcn.h>

Expand Down Expand Up @@ -214,4 +214,4 @@ __attribute__((__noreturn__)) void rethrow_exception(std::exception_ptr ep) {
} // namespace std
#endif

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/ExceptionTracerLib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <exception>
#include <typeinfo>

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

namespace folly {
namespace exception_tracer {
Expand All @@ -39,4 +39,4 @@ void registerRethrowExceptionCallback(RethrowExceptionSig& callback);
} // namespace exception_tracer
} // namespace folly

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/SmartExceptionStackTraceHooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

namespace folly::exception_tracer {

Expand Down Expand Up @@ -98,6 +98,6 @@ Initialize initialize;
} // namespace
} // namespace folly::exception_tracer

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/SmartExceptionTracer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

namespace folly {
namespace exception_tracer {
Expand Down Expand Up @@ -133,6 +133,6 @@ ExceptionInfo getAsyncTrace(const std::exception& ex) {
} // namespace exception_tracer
} // namespace folly

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
4 changes: 2 additions & 2 deletions folly/debugging/exception_tracer/SmartExceptionTracer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#if FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF

#if defined(__GLIBCXX__)
#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#define FOLLY_HAVE_SMART_EXCEPTION_TRACER 1

Expand All @@ -45,6 +45,6 @@ ExceptionInfo getAsyncTrace(const exception_wrapper& ew);

} // namespace folly::exception_tracer

#endif // defined(__GLIBCXX__)
#endif // defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)

#endif // FOLLY_HAVE_ELF && FOLLY_HAVE_DWARF
Loading