diff options
| author | David Srbecky <dsrbecky@google.com> | 2021-05-13 10:23:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-13 10:23:44 +0000 |
| commit | 7b89804d8a380365a14a75f37cf44d9a43da1a36 (patch) | |
| tree | dfc0daea1ad44556b777262a980de027ebb13220 | |
| parent | e7bc7bde238acdd894f53c1c6c57e436e7d8312e (diff) | |
| parent | defbe6bfbd048860e0ec2af869731f7be88a78c3 (diff) | |
| download | bionic-7b89804d8a380365a14a75f37cf44d9a43da1a36.tar.gz | |
Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0 am: defbe6bfbd
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416
Change-Id: Iab72065969294c1259351272ba8eab78a5591f6d
| -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()) { |