diff options
author | Christopher Ferris <cferris@google.com> | 2019-12-04 13:37:11 -0800 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2019-12-04 22:29:59 +0000 |
commit | 10814734c09e5bc42599266cc79e741cbe4928e7 (patch) | |
tree | 4f40984ab33b9451559222cfdc4a9e65541d6233 /libunwindstack/include/unwindstack/RegsX86_64.h | |
parent | d2b97d4899c9aa707153f08c64e2ae90a08db1d6 (diff) | |
download | unwinding-10814734c09e5bc42599266cc79e741cbe4928e7.tar.gz |
Use elf offset in signal step check.
The function StepIfSignalHandler assumed that the rel_pc passed
to it was actually an elf offset. A new version of clang created a libc.so
that has a load bias, so tests unwinding through a signal handler
would fail on arm. On other ABIs, there is unwind information that could
be used instead, so the unwind still worked.
The fix is to subtract the load bias from the rel_pc to get an elf
offset to pass to the Register StepIfSignalHandler functions. Change all
of the Register funtions to make it clear what the first parameter means.
Add a unit test for this new code. Also, add an offline test for
this case.
Bug: 145683525
Test: Ran unit tests using the new clang and the old clang.
Change-Id: I3e249653b79bcad6d3a56411a7911fde4888e9d6
Diffstat (limited to 'libunwindstack/include/unwindstack/RegsX86_64.h')
-rw-r--r-- | libunwindstack/include/unwindstack/RegsX86_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libunwindstack/include/unwindstack/RegsX86_64.h b/libunwindstack/include/unwindstack/RegsX86_64.h index dc9a220..3e919a4 100644 --- a/libunwindstack/include/unwindstack/RegsX86_64.h +++ b/libunwindstack/include/unwindstack/RegsX86_64.h @@ -41,7 +41,7 @@ class RegsX86_64 : public RegsImpl<uint64_t> { bool SetPcFromReturnAddress(Memory* process_memory) override; - bool StepIfSignalHandler(uint64_t rel_pc, Elf* elf, Memory* process_memory) override; + bool StepIfSignalHandler(uint64_t elf_offset, Elf* elf, Memory* process_memory) override; void SetFromUcontext(x86_64_ucontext_t* ucontext); |