diff options
| author | Christopher Ferris <cferris@google.com> | 2018-10-30 16:16:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-30 16:16:45 +0000 |
| commit | b31badf70f7734d1ef6d1a95ee73dc57ebd2b19d (patch) | |
| tree | b150ea58a97519c38abf33f0654eb709d0c9846f /libbacktrace/UnwindStack.cpp | |
| parent | 1d0ee36de7af27ee43e5075b99e9427130a1f0f1 (diff) | |
| parent | 4568f4bc0f116f097a13b1d931de93cf525ae204 (diff) | |
Merge "Verify that the elf matches the expected arch."
Diffstat (limited to 'libbacktrace/UnwindStack.cpp')
| -rw-r--r-- | libbacktrace/UnwindStack.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libbacktrace/UnwindStack.cpp b/libbacktrace/UnwindStack.cpp index 4e7f761ff..fe28eba41 100644 --- a/libbacktrace/UnwindStack.cpp +++ b/libbacktrace/UnwindStack.cpp @@ -49,6 +49,7 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map, unwindstack::Unwinder unwinder(MAX_BACKTRACE_FRAMES + num_ignore_frames, stack_map->stack_maps(), regs, stack_map->process_memory()); unwinder.SetResolveNames(stack_map->ResolveNames()); + stack_map->SetArch(regs->Arch()); if (stack_map->GetJitDebug() != nullptr) { unwinder.SetJitDebug(stack_map->GetJitDebug(), regs->Arch()); } |