diff options
| -rw-r--r-- | libstdc++-v3/include/debug/formatter.h | 35 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/debug.cc | 19 |
2 files changed, 30 insertions, 24 deletions
diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h index f120163..e8a83a2 100644 --- a/libstdc++-v3/include/debug/formatter.h +++ b/libstdc++-v3/include/debug/formatter.h @@ -32,32 +32,17 @@ #include <bits/c++config.h> #if _GLIBCXX_HAVE_STACKTRACE -struct __glibcxx_backtrace_state; - extern "C" { - __glibcxx_backtrace_state* + struct __glibcxx_backtrace_state* __glibcxx_backtrace_create_state(const char*, int, void(*)(void*, const char*, int), void*); - - typedef int (*__glibcxx_backtrace_full_callback) ( - void*, __UINTPTR_TYPE__, const char *, int, const char*); - - typedef void (*__glibcxx_backtrace_error_callback) ( - void*, const char*, int); - - typedef int (*__glibcxx_backtrace_full_func) ( - __glibcxx_backtrace_state*, int, - __glibcxx_backtrace_full_callback, - __glibcxx_backtrace_error_callback, - void*); - int __glibcxx_backtrace_full( - __glibcxx_backtrace_state*, int, - __glibcxx_backtrace_full_callback, - __glibcxx_backtrace_error_callback, + struct __glibcxx_backtrace_state*, int, + int (*)(void*, __UINTPTR_TYPE__, const char *, int, const char*), + void (*)(void*, const char*, int), void*); } #endif @@ -609,10 +594,10 @@ namespace __gnu_debug , _M_function(__function) #if _GLIBCXX_HAVE_STACKTRACE # ifdef _GLIBCXX_DEBUG_BACKTRACE - , _M_backtrace_state(__glibcxx_backtrace_create_state(0, 0, 0, 0)) + , _M_backtrace_state(__glibcxx_backtrace_create_state(0, 1, _S_err, 0)) , _M_backtrace_full(&__glibcxx_backtrace_full) # else - , _M_backtrace_state() + , _M_backtrace_state(0) # endif #endif { } @@ -631,8 +616,12 @@ namespace __gnu_debug const char* _M_text; const char* _M_function; #if _GLIBCXX_HAVE_STACKTRACE - __glibcxx_backtrace_state* _M_backtrace_state; - __glibcxx_backtrace_full_func _M_backtrace_full; + struct __glibcxx_backtrace_state* _M_backtrace_state; + // TODO: Remove _M_backtrace_full after __glibcxx_backtrace_full is moved + // from libstdc++_libbacktrace.a to libstdc++.so: + __decltype(&__glibcxx_backtrace_full) _M_backtrace_full; + + static void _S_err(void*, const char*, int) { } #endif public: diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc index 9eda380..83996ff 100644 --- a/libstdc++-v3/src/c++11/debug.cc +++ b/libstdc++-v3/src/c++11/debug.cc @@ -1141,6 +1141,23 @@ namespace return ret; } + + void + print_backtrace_error(void* data, const char* msg, int errnum) + { + PrintContext& ctx = *static_cast<PrintContext*>(data); + + print_literal(ctx, "Backtrace unavailable: "); + print_word(ctx, msg ? msg : "<unknown error>"); + if (errnum > 0) + { + char buf[64]; + int written = __builtin_sprintf(buf, " (errno=%d)\n", errnum); + print_word(ctx, buf, written); + } + else + print_literal(ctx, "\n"); + } #endif } @@ -1193,7 +1210,7 @@ namespace __gnu_debug { print_literal(ctx, "Backtrace:\n"); _M_backtrace_full( - _M_backtrace_state, 1, print_backtrace, nullptr, &ctx); + _M_backtrace_state, 1, print_backtrace, print_backtrace_error, &ctx); ctx._M_first_line = true; print_literal(ctx, "\n"); } |