Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 617ed8e7 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix stack test on arm32" am: 7ff1eb69 am: 53e56177 

am: ad0711b5

Change-Id: I0d6c15ed91f33cee1f3cc22f6fd7dad70241a35f
parents 3683fe1b ad0711b5

libmemunreachable/tests/MemUnreachable_test.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -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;

  }

  }





  {

  {