summaryrefslogtreecommitdiff
path: root/libc/malloc_debug/malloc_debug.cpp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2022-03-04 23:19:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-04 23:19:56 +0000
commit5fbda5b808e807f33e33221a0e4a8e9e2d614f66 (patch)
tree96a636854aa41bdfca0adfe4ac98bd1923ece7a4 /libc/malloc_debug/malloc_debug.cpp
parentfd5fa7d82e97c3b93a72b41c6e64ddf93ec36eab (diff)
parent25de3ac3f1bdd5f0f0d81a090160fdb09b108413 (diff)
Merge "Update for LocalUnwinder object removal." am: 25de3ac3f1
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2007331 Change-Id: I34b0502a05780af5b5d1068408de6c29e032e4eb
Diffstat (limited to 'libc/malloc_debug/malloc_debug.cpp')
-rw-r--r--libc/malloc_debug/malloc_debug.cpp3
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 {