Merge "Fix stack test on arm32" am: 7ff1eb698c

am: 53e56177b5

Change-Id: I8f9f6f6db412888fef6ab752bacf634d6c460d30
This commit is contained in:
Colin Cross 2017-06-23 00:44:44 +00:00 committed by android-build-merger
commit ad0711b520

View file

@ -40,7 +40,8 @@ class HiddenPointer {
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 @@ TEST(MemunreachableTest, stack) {
{
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;
}
{