diff options
| author | Christopher Ferris <cferris@google.com> | 2022-03-04 23:42:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-04 23:42:30 +0000 |
| commit | ee56b9256e8fbfad83b09c3c31044960c0573cf2 (patch) | |
| tree | 78d8442db21c20331c5f66aa98ff39e821b7f568 /libc/malloc_debug/malloc_debug.cpp | |
| parent | 64cde2d1397e281e5dda2cce170283754e22be93 (diff) | |
| parent | 5fbda5b808e807f33e33221a0e4a8e9e2d614f66 (diff) | |
Merge "Update for LocalUnwinder object removal." am: 25de3ac3f1 am: 5fbda5b808
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2007331
Change-Id: Iebfc7addcfc8cd2d552568942dac105fbe315c77
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 { |