diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-21 14:27:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-21 14:27:49 +0000 |
| commit | f5005193618564dc26a7c09c6cdcddff2786de5c (patch) | |
| tree | 9bb242303fd7c25917f59b2f6cf536b2f4f113e1 /libc/malloc_debug/malloc_debug.cpp | |
| parent | 1647918efde8783edfcff6d4166b6eac09e2a7f1 (diff) | |
| parent | 5679394ddb63a7b5f6231319d504dbdb55a9a6d9 (diff) | |
Merge "Revert "Add tagged pointers to bionic."" am: 5c9efd1d66 am: 17c01113a3 am: 5679394ddb
Change-Id: I4704361c1fcd21b3e5be0e75ec20669744f09b63
Diffstat (limited to 'libc/malloc_debug/malloc_debug.cpp')
| -rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index 6eaac7de8..c0765a983 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -43,7 +43,6 @@ #include <android-base/file.h> #include <android-base/properties.h> #include <android-base/stringprintf.h> -#include <bionic/malloc_tagged_pointers.h> #include <private/bionic_malloc_dispatch.h> #include <private/MallocXmlElem.h> @@ -884,7 +883,6 @@ ssize_t debug_malloc_backtrace(void* pointer, uintptr_t* frames, size_t max_fram if (!(g_debug->config().options() & BACKTRACE)) { return 0; } - pointer = UntagPointer(pointer); return PointerData::GetFrames(pointer, frames, max_frames); } |