tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update API of MapInfo from libunwindstack" am: 453076b8d0 am: defbe6bfbd

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1705416

Change-Id: Iab72065969294c1259351272ba8eab78a5591f6d
This commit is contained in:
David Srbecky 2021-05-13 10:23:44 +00:00 committed by Automerger Merge Worker
commit 7b89804d8a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libc/malloc_debug/PointerData.cpp
View file

@ -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, "\"\"");
}

10
libc/malloc_debug/UnwindBacktrace.cpp
View file

@ -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()) {