diff options
Diffstat (limited to 'debuggerd/crash_dump.cpp')
| -rw-r--r-- | debuggerd/crash_dump.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp index 4f600055d2..007a20fcec 100644 --- a/debuggerd/crash_dump.cpp +++ b/debuggerd/crash_dump.cpp @@ -40,6 +40,7 @@ #include <android-base/stringprintf.h> #include <android-base/strings.h> #include <android-base/unique_fd.h> +#include <bionic/macros.h> #include <bionic/reserved_signals.h> #include <cutils/sockets.h> #include <log/log.h> @@ -299,7 +300,9 @@ static void ReadCrashInfo(unique_fd& fd, siginfo_t* siginfo, *siginfo = crash_info->data.s.siginfo; if (signal_has_si_addr(siginfo)) { process_info->has_fault_address = true; - process_info->fault_address = reinterpret_cast<uintptr_t>(siginfo->si_addr); + process_info->maybe_tagged_fault_address = reinterpret_cast<uintptr_t>(siginfo->si_addr); + process_info->untagged_fault_address = + untag_address(reinterpret_cast<uintptr_t>(siginfo->si_addr)); } regs->reset(unwindstack::Regs::CreateFromUcontext(unwindstack::Regs::CurrentArch(), &crash_info->data.s.ucontext)); |