From 71c4d186f1cf247f1aa45f4fd1b38f350b68d123 Mon Sep 17 00:00:00 2001 From: David Spickett Date: Wed, 15 Mar 2023 09:54:47 +0000 Subject: Revert "[lldb] Refactor CrashReason" This reverts commit af38530ee29c285f3827e33a41edf27c9c3a6767 due to a build failure on 32 bit. --- lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp') diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp index b62e9f643fa7..9b9dfe521460 100644 --- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp @@ -294,19 +294,19 @@ void NativeThreadLinux::SetStoppedBySignal(uint32_t signo, case SIGBUS: case SIGFPE: case SIGILL: - m_stop_description = GetCrashReasonString(*info); -#ifndef SEGV_MTESERR -#define SEGV_MTESERR 9 -#endif - if (info->si_signo == SIGSEGV && info->si_code == SEGV_MTESERR) - AnnotateSyncTagCheckFault( - reinterpret_cast(info->si_addr)); + const auto reason = GetCrashReason(*info); + m_stop_description = GetCrashReasonString(reason, *info); + + if (reason == CrashReason::eSyncTagCheckFault) { + AnnotateSyncTagCheckFault(info); + } + break; } } } -void NativeThreadLinux::AnnotateSyncTagCheckFault(lldb::addr_t fault_addr) { +void NativeThreadLinux::AnnotateSyncTagCheckFault(const siginfo_t *info) { int32_t allocation_tag_type = 0; switch (GetProcess().GetArchitecture().GetMachine()) { // aarch64_32 deliberately not here because there's no 32 bit MTE @@ -331,6 +331,7 @@ void NativeThreadLinux::AnnotateSyncTagCheckFault(lldb::addr_t fault_addr) { m_stop_description.pop_back(); std::stringstream ss; + lldb::addr_t fault_addr = reinterpret_cast(info->si_addr); std::unique_ptr manager(std::move(details->manager)); ss << " logical tag: 0x" << std::hex << manager->GetLogicalTag(fault_addr); -- cgit v1.2.3