| commit | df75e05551a84e28a344c29cc6b7655e3adbedb2 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Aug 13 01:17:20 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 13 01:17:20 2022 +0000 |
| tree | 31cb61cb3264527d2adf6694160d9b88fad1f735 | |
| parent | 2e48f897b5997ab8b966214302847a540e9d3737 [diff] | |
| parent | 94d8e02d3390ac02a3bb69253a3f278852821944 [diff] |
Merge "Adjust the calculation method of pc" am: 94d8e02d33 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2145980 Change-Id: Ie15179c4d8d71783e03c13dd31ec5d55d6d494d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libc/malloc_debug/MapData.cpp b/libc/malloc_debug/MapData.cpp index ded81a2..b22c109 100644 --- a/libc/malloc_debug/MapData.cpp +++ b/libc/malloc_debug/MapData.cpp
@@ -210,7 +210,7 @@ } } } - *rel_pc = pc - entry->start + entry->load_bias; + *rel_pc = pc - entry->start + entry->offset + entry->load_bias; } return entry; }