diff options
author | Christopher Ferris <cferris@google.com> | 2015-05-02 00:07:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-02 00:07:18 +0000 |
commit | 6f1be4493a558e8dabdc981b37852a2008f7bef1 (patch) | |
tree | 5b32f0ef37b38b05edfcbe1c70e1b2a7184cf78a /runtime/utils.cc | |
parent | 3bf2d475f0f1d1c2d292714b48a1ccb9c9eadac2 (diff) | |
parent | 332ef327c2b1a5e1774ba0d1da23e07303002af9 (diff) | |
download | art-6f1be4493a558e8dabdc981b37852a2008f7bef1.tar.gz art-6f1be4493a558e8dabdc981b37852a2008f7bef1.tar.bz2 art-6f1be4493a558e8dabdc981b37852a2008f7bef1.zip |
Merge "Let the map function compute the relative pc." into mnc-dev
Diffstat (limited to 'runtime/utils.cc')
-rw-r--r-- | runtime/utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/utils.cc b/runtime/utils.cc index ec7131dd2..e18af0069 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -1298,7 +1298,7 @@ void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix, if (!BacktraceMap::IsValid(it->map)) { os << StringPrintf("%08" PRIxPTR " ???", it->pc); } else { - os << StringPrintf("%08" PRIxPTR " ", it->pc - it->map.start); + os << StringPrintf("%08" PRIxPTR " ", BacktraceMap::GetRelativePc(it->map, it->pc)); os << it->map.name; os << " ("; if (!it->func_name.empty()) { |