commit fa7c2c3ddac3d6a95fdf5e61ed2b6e949d888dca
author Colin Cross <ccross@android.com> Fri Jun 23 01:06:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 01:06:45 2017 +0000
tree 4b51061862c4f9b9ee4067d0e9d72892c2f6c9c5
parent acadc047b6d692aecb7417be23014509c9641d61
parent 046008483acce9b03cb8e28a197aad14c8dc63ab

Merge "Fix stack test on arm32" am: 7ff1eb698c am: 53e56177b5 am: ad0711b520
am: 617ed8e75a

Change-Id: I4115cb53ecd2d1ba47104022407d99626fd1b050

libmemunreachable/tests/MemUnreachable_test.cpp

diff --git a/libmemunreachable/tests/MemUnreachable_test.cpp b/libmemunreachable/tests/MemUnreachable_test.cpp
index bb6bcbc..ec89388 100644
--- a/libmemunreachable/tests/MemUnreachable_test.cpp
+++ b/libmemunreachable/tests/MemUnreachable_test.cpp
@@ -40,7 +40,8 @@
   volatile uintptr_t ptr_;
 };
 
-static void Ref(void* ptr) {
+// Trick the compiler into thinking a value on the stack is still referenced.
+static void Ref(void** ptr) {
   write(0, ptr, 0);
 }
 
@@ -58,14 +59,14 @@
 
   {
     void* ptr = hidden_ptr.Get();
-    Ref(ptr);
+    Ref(&ptr);
 
     UnreachableMemoryInfo info;
 
     ASSERT_TRUE(GetUnreachableMemory(info));
     ASSERT_EQ(0U, info.leaks.size());
 
-    Ref(ptr);
+    ptr = nullptr;
   }
 
   {