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

Jump to bottom

[lldb][AArch64] Do not crash if NT_ARM_TLS is missing #106478

Merged
merged 3 commits into from
Aug 30, 2024
Merged

[lldb][AArch64] Do not crash if NT_ARM_TLS is missing #106478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6854730
[lldb][AArch64] Do not crash if NT_ARM_TLS is missing
igorkudrin Aug 29, 2024
9036670
fixup: add braces
igorkudrin Aug 29, 2024
5d64120
fixup: remove "REQUIRES: aarch64"
igorkudrin Aug 29, 2024
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
8 changes: 5 additions & 3 deletions lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,11 @@ RegisterInfoPOSIX_arm64::RegisterInfoPOSIX_arm64(
if (m_opt_regsets.AllSet(eRegsetMaskMTE))
AddRegSetMTE();

// The TLS set always contains tpidr but only has tpidr2 when SME is
// present.
AddRegSetTLS(m_opt_regsets.AllSet(eRegsetMaskSSVE));
if (m_opt_regsets.AllSet(eRegsetMaskTLS)) {
// The TLS set always contains tpidr but only has tpidr2 when SME is
// present.
AddRegSetTLS(m_opt_regsets.AllSet(eRegsetMaskSSVE));
}

if (m_opt_regsets.AnySet(eRegsetMaskSSVE))
AddRegSetSME(m_opt_regsets.AnySet(eRegsetMaskZT));
Expand Down
32 changes: 32 additions & 0 deletions lldb/test/Shell/Process/elf-core/aarch64-no-NT_ARM_TLS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## Check that lldb does not crash if a core file does not contain an NT_ARM_TLS
## note while there are notes for other dynamic register sets.

# RUN: yaml2obj %s -o %t
# RUN: %lldb -c %t -o "re r -a" | FileCheck %s

# CHECK: Pointer Authentication Registers:
# CHECK-NEXT: data_mask =
# CHECK-NEXT: code_mask =
# CHECK-NOT: Thread Local Storage Registers:

--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_CORE
Machine: EM_AARCH64
ProgramHeaders:
- Type: PT_NOTE
FirstSec: .note
LastSec: .note
Sections:
- Name: .note
Type: SHT_NOTE
Notes:
- Name: CORE
Desc: 0b00000000000000000000000b00000000000000000000000000000000000000389300001b930000389300001b930000000000000000000000000000000000000000000000000000e02e0000000000000000000000000000119100000000000000000000000000005ee100000000000000000000000000002f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400162e2ffff00005801400000000000200162e2ffff0000240140000000000000000000000000000100000000000000
Type: NT_PRSTATUS
- Name: LINUX
Desc: 0000000000007f000000000000007f00
Type: NT_ARM_PAC_MASK
...
1 change: 1 addition & 0 deletions lldb/test/Shell/Process/elf-core/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config.suffixes = ['.yaml']
Loading