diff options
| author | David Srbecky <dsrbecky@google.com> | 2021-05-13 10:55:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-13 10:55:14 +0000 |
| commit | d37ab49cc8db7eed6969a1f46b542b52585929cc (patch) | |
| tree | dfc0daea1ad44556b777262a980de027ebb13220 | |
| parent | eebb878a1d2a6dfd0f8e5a2af0fe4628215c6632 (diff) | |
| parent | a3b1926d75c2e46083429ae1e952035480dc3221 (diff) | |
| download | bionic-d37ab49cc8db7eed6969a1f46b542b52585929cc.tar.gz | |
Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0 am: defbe6bfbd am: 7b89804d8a am: a3b1926d75
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416
Change-Id: Ifa8d385ca10e4465aad32c02dcde7bafb953a4a4
| -rw-r--r-- | libc/malloc_debug/PointerData.cpp | 4 | ||||
| -rw-r--r-- | libc/malloc_debug/UnwindBacktrace.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libc/malloc_debug/PointerData.cpp b/libc/malloc_debug/PointerData.cpp index 4f81ff7ff..90c913638 100644 --- a/libc/malloc_debug/PointerData.cpp +++ b/libc/malloc_debug/PointerData.cpp @@ -588,8 +588,8 @@ void PointerData::DumpLiveToFile(int fd) { dprintf(fd, " bt_info"); for (const auto& frame : *info.backtrace_info) { dprintf(fd, " {"); - if (frame.map_info != nullptr && !frame.map_info->name.empty()) { - dprintf(fd, "\"%s\"", frame.map_info->name.c_str()); + if (frame.map_info != nullptr && !frame.map_info->name().empty()) { + dprintf(fd, "\"%s\"", frame.map_info->name().c_str()); } else { dprintf(fd, "\"\""); } diff --git a/libc/malloc_debug/UnwindBacktrace.cpp b/libc/malloc_debug/UnwindBacktrace.cpp index 92fb3fa96..128991bd9 100644 --- a/libc/malloc_debug/UnwindBacktrace.cpp +++ b/libc/malloc_debug/UnwindBacktrace.cpp @@ -90,14 +90,14 @@ void UnwindLog(const std::vector<unwindstack::LocalFrameData>& frame_info) { unwindstack::MapInfo* map_info = info->map_info; std::string line = android::base::StringPrintf(" #%0zd pc %" PAD_PTR " ", i, info->rel_pc); - if (map_info->offset != 0) { - line += android::base::StringPrintf("(offset 0x%" PRIx64 ") ", map_info->offset); + if (map_info->offset() != 0) { + line += android::base::StringPrintf("(offset 0x%" PRIx64 ") ", map_info->offset()); } - if (map_info->name.empty()) { - line += android::base::StringPrintf("<anonymous:%" PRIx64 ">", map_info->start); + if (map_info->name().empty()) { + line += android::base::StringPrintf("<anonymous:%" PRIx64 ">", map_info->start()); } else { - line += map_info->name; + line += map_info->name(); } if (!info->function_name.empty()) { |