summaryrefslogtreecommitdiff
path: root/libc/malloc_debug/UnwindBacktrace.cpp
diff options
context:
space:
mode:
authorScott Lobdell <slobdell@google.com>2021-06-04 18:02:41 +0000
committerScott Lobdell <slobdell@google.com>2021-06-04 18:02:41 +0000
commit0bcd17afeb7a5910cd64f3caae05195be70748bd (patch)
tree987239151d1b183e0de5e31eabcbadea00742843 /libc/malloc_debug/UnwindBacktrace.cpp
parent5af6b7975694b08e8e363e9435990f248fbb39ca (diff)
parent37274da1bd5f3bb2259c0edd6aff767c3998af73 (diff)
Merge SP1A.210604.001
Change-Id: Id2e423c8ff6a838a96260a5b919810d4ef11e8db
Diffstat (limited to 'libc/malloc_debug/UnwindBacktrace.cpp')
-rw-r--r--libc/malloc_debug/UnwindBacktrace.cpp10
1 files changed, 5 insertions, 5 deletions
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()) {