Merge "Fix stack test on arm32"

This commit is contained in:
Treehugger Robot 2017-06-23 00:31:42 +00:00 committed by Gerrit Code Review
commit 7ff1eb698c

View file

@ -40,7 +40,8 @@ class HiddenPointer {
volatile uintptr_t ptr_; 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); write(0, ptr, 0);
} }
@ -58,14 +59,14 @@ TEST(MemunreachableTest, stack) {
{ {
void* ptr = hidden_ptr.Get(); void* ptr = hidden_ptr.Get();
Ref(ptr); Ref(&ptr);
UnreachableMemoryInfo info; UnreachableMemoryInfo info;
ASSERT_TRUE(GetUnreachableMemory(info)); ASSERT_TRUE(GetUnreachableMemory(info));
ASSERT_EQ(0U, info.leaks.size()); ASSERT_EQ(0U, info.leaks.size());
Ref(ptr); ptr = nullptr;
} }
{ {