commit 4edbcee2c65bd38efae1411a847a6af9b22642fc
author Evgenii Stepanov <eugenis@google.com> Fri Sep 17 14:59:15 2021 -0700
committer Evgenii Stepanov <eugenis@google.com> Fri Sep 24 11:21:38 2021 -0700
tree 1af7f53978b666aa035b49e6dba3a5d755a3217b
parent e8121199fdd83b81933eb0a558e7ea33b8bdd19e

Random HWASan cleanups.

Makes CtsBionicTestCases pass under HWASan.

Bug: 193568145
Test: CtsBionicTestCases
Change-Id: I38ee8a8508827c0ffee61ce33bb8c6a3f40388c9

tests/dlext_test.cpp

diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp
index e3caf0e..47214b8 100644
--- a/tests/dlext_test.cpp
+++ b/tests/dlext_test.cpp
@@ -714,7 +714,7 @@
 }
 
 std::string DlExtRelroSharingTest::FindMappingName(void* ptr) {
-  uint64_t addr = reinterpret_cast<uint64_t>(ptr);
+  uint64_t addr = reinterpret_cast<uint64_t>(untag_address(ptr));
   std::string found_name = "<not found>";
 
   EXPECT_TRUE(android::procinfo::ReadMapFile("/proc/self/maps",