diff options
| author | Daniel Norman <danielnorman@google.com> | 2021-06-18 20:06:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-18 20:06:51 +0000 |
| commit | 5aeffd28678e6c0b1d6ff06de85dc7bf22b5e53d (patch) | |
| tree | f227dda74458d6728b5ac0ace6f0479a8759d8b0 /libc/malloc_debug/UnwindBacktrace.cpp | |
| parent | 4c90af54ee40fd5850f3a201fba9f706f9c2619f (diff) | |
| parent | 0bcd17afeb7a5910cd64f3caae05195be70748bd (diff) | |
Merge "Merge SP1A.210604.001 Change-Id: Id2e423c8ff6a838a96260a5b919810d4ef11e8db" into s-keystone-qcom-dev
Diffstat (limited to 'libc/malloc_debug/UnwindBacktrace.cpp')
| -rw-r--r-- | libc/malloc_debug/UnwindBacktrace.cpp | 10 |
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()) { |