diff options
| author | Christopher Ferris <cferris@google.com> | 2022-01-07 13:38:10 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2022-03-03 15:23:25 -0800 |
| commit | 459eecb28b68f9b8f2a71ca9765b291f11007030 (patch) | |
| tree | 96a636854aa41bdfca0adfe4ac98bd1923ece7a4 /libc/malloc_debug/malloc_debug.cpp | |
| parent | 39837afad7ba9411445677497f8c60b01a0b4195 (diff) | |
Update for LocalUnwinder object removal.
Modify libfdtrack to use the normal Unwinder object. In addition,
update the libfdtrack so that it doesn't record frames in
libfdtrack.so rather than skipping frames it thinks will be in
the library.
Modify the malloc debug code to use the normal Unwinder object.
Bug: 120606663
Test: All unit tests pass.
Change-Id: I3c9612dd10e62389e6219e68045ee87f7b2625f5
Diffstat (limited to 'libc/malloc_debug/malloc_debug.cpp')
| -rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index d23ab15c3..9f38946af 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -49,6 +49,7 @@ #include <platform/bionic/reserved_signals.h> #include <private/MallocXmlElem.h> #include <private/bionic_malloc_dispatch.h> +#include <unwindstack/Unwinder.h> #include "Config.h" #include "DebugData.h" @@ -193,7 +194,7 @@ static void InitAtfork() { void BacktraceAndLog() { if (g_debug->config().options() & BACKTRACE_FULL) { std::vector<uintptr_t> frames; - std::vector<unwindstack::LocalFrameData> frames_info; + std::vector<unwindstack::FrameData> frames_info; if (!Unwind(&frames, &frames_info, 256)) { error_log(" Backtrace failed to get any frames."); } else { |