diff options
Diffstat (limited to 'libunwindstack/Elf.cpp')
| -rw-r--r-- | libunwindstack/Elf.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libunwindstack/Elf.cpp b/libunwindstack/Elf.cpp index f01b0926b8..286febcdcb 100644 --- a/libunwindstack/Elf.cpp +++ b/libunwindstack/Elf.cpp @@ -124,6 +124,12 @@ bool Elf::GetGlobalVariableOffset(const std::string& name, uint64_t* memory_offs return false; } + if (arch() == ARCH_ARM64) { + // Tagged pointer after Android R would lead top byte to have random values + // https://source.android.com/devices/tech/debug/tagged-pointers + vaddr &= (1ULL << 56) - 1; + } + // Check the .data section. uint64_t vaddr_start = interface_->data_vaddr_start(); if (vaddr >= vaddr_start && vaddr < interface_->data_vaddr_end()) { |