diff options
| author | Florian Mayer <fmayer@google.com> | 2022-04-18 20:37:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-18 20:37:32 +0000 |
| commit | f3494c52155872ff548873ca0b2096979c3845e0 (patch) | |
| tree | d161c7656600c46f682319b4c4e0962234404281 | |
| parent | ae69745eaf507a3ff3baad0fb9967f82a0e2e3c8 (diff) | |
| parent | 381418125d9162d989a02554695cf6aa3c39d11e (diff) | |
| download | libmemunreachable-f3494c52155872ff548873ca0b2096979c3845e0.tar.gz | |
Merge "Fix HeapWalker test under hwasan."
| -rw-r--r-- | tests/HeapWalker_test.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/HeapWalker_test.cpp b/tests/HeapWalker_test.cpp index 9610cd6..f78fd66 100644 --- a/tests/HeapWalker_test.cpp +++ b/tests/HeapWalker_test.cpp @@ -25,6 +25,14 @@ namespace android { +static inline uintptr_t UntagAddress(uintptr_t addr) { +#if defined(__aarch64__) + constexpr uintptr_t mask = (static_cast<uintptr_t>(1) << 56) - 1; + addr = addr & mask; +#endif + return addr; +} + class HeapWalkerTest : public ::testing::Test { public: HeapWalkerTest() : disable_malloc_(), heap_() {} @@ -113,8 +121,8 @@ TEST_F(HeapWalkerTest, leak) { EXPECT_EQ(1U, num_leaks); EXPECT_EQ(16U, leaked_bytes); ASSERT_EQ(1U, leaked.size()); - EXPECT_EQ(buffer_begin(buffer2), leaked[0].begin); - EXPECT_EQ(buffer_end(buffer2), leaked[0].end); + EXPECT_EQ(UntagAddress(buffer_begin(buffer2)), leaked[0].begin); + EXPECT_EQ(UntagAddress(buffer_end(buffer2)), leaked[0].end); } TEST_F(HeapWalkerTest, live) { |