diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-01-21 13:56:21 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2020-01-21 13:57:26 +0000 |
| commit | ce4c42e09fb9039df7c6a5b7306119279a694897 (patch) | |
| tree | 13e38338ea7bc859b295b923be6a7acd73edbebc /libc/malloc_debug/malloc_debug.cpp | |
| parent | 43d5f9d4dd83d15a859d9be1359c4a4a47381fea (diff) | |
Revert "Add tagged pointers to bionic."
This reverts commit 43d5f9d4dd83d15a859d9be1359c4a4a47381fea.
Bug: 135754954
Bug: 147147490
Exempt-From-Owner-Approval: clean revert
Reason for revert: Breaks ART gtest, see:
https://ci.chromium.org/p/art/builders/ci/angler-armv8-non-gen-cc/561
The crash happens on mprotect of a page, the test crashes with ENOMEM.
Change-Id: I52eea1abbfaf8d8e2226f92d30aa55aba3810528
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); } |