diff options
| author | Christopher Ferris <cferris@google.com> | 2020-09-28 20:33:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-28 20:33:51 +0000 |
| commit | 96e73d573e09dd8cb0afb1205ca7df1f0c20fa98 (patch) | |
| tree | 1f139a357de89063c2ca58754f583de61797e456 /debuggerd/handler/debuggerd_fallback.cpp | |
| parent | 75766694c2969fc87ae2ab81733894d659e80947 (diff) | |
| parent | 06c5c6958ad9455b579b7b29c0fc881adec573cc (diff) | |
Merge "Add arch member into Unwinder object." am: 087552a89b am: 89f54f6f86 am: d232e3c435 am: 0bd4f2dfc1 am: 06c5c6958a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1437275
Change-Id: I5c48e2558686db96b082d0d334a97c24f4296037
Diffstat (limited to 'debuggerd/handler/debuggerd_fallback.cpp')
| -rw-r--r-- | debuggerd/handler/debuggerd_fallback.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/debuggerd/handler/debuggerd_fallback.cpp b/debuggerd/handler/debuggerd_fallback.cpp index 9bcbdb36a3..abcb2c4ed5 100644 --- a/debuggerd/handler/debuggerd_fallback.cpp +++ b/debuggerd/handler/debuggerd_fallback.cpp @@ -82,16 +82,12 @@ static void debuggerd_fallback_trace(int output_fd, ucontext_t* ucontext) { thread.pid = getpid(); thread.tid = gettid(); thread.thread_name = get_thread_name(gettid()); - unwindstack::ArchEnum arch = unwindstack::Regs::CurrentArch(); - thread.registers.reset(unwindstack::Regs::CreateFromUcontext(arch, ucontext)); + thread.registers.reset( + unwindstack::Regs::CreateFromUcontext(unwindstack::Regs::CurrentArch(), ucontext)); // TODO: Create this once and store it in a global? unwindstack::UnwinderFromPid unwinder(kMaxFrames, getpid()); - if (unwinder.Init(arch)) { - dump_backtrace_thread(output_fd, &unwinder, thread); - } else { - async_safe_format_log(ANDROID_LOG_ERROR, "libc", "Unable to init unwinder."); - } + dump_backtrace_thread(output_fd, &unwinder, thread); } __linker_disable_fallback_allocator(); } |