Backed out changeset 51c81beac6aa (bug 1158445) for bustage on Android in mfbt/Poison.cpp. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 07 Jun 2017 18:25:48 +0200
changeset 413205 ea32af8eee1459bdcbe85c8a3e7b78b374802d1c
parent 413204 f58a80807c734285f69680c036bc41f3cb74e6bd
child 413206 548be4ca230bf01b914dd685f92d35897803a31b
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1158445
milestone55.0a1
backs out51c81beac6aa43f61b67adc5bc0692476759246f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 51c81beac6aa (bug 1158445) for bustage on Android in mfbt/Poison.cpp. r=backout
mfbt/Poison.cpp
mfbt/tests/TestPoisonArea.cpp
--- a/mfbt/Poison.cpp
+++ b/mfbt/Poison.cpp
@@ -124,17 +124,17 @@ static void
 ReleaseRegion(void* aRegion, uintptr_t aSize)
 {
   munmap(aRegion, aSize);
 }
 
 static bool
 ProbeRegion(uintptr_t aRegion, uintptr_t aSize)
 {
-  if (posix_madvise(reinterpret_cast<void*>(aRegion), aSize, POSIX_MADV_NORMAL)) {
+  if (madvise(reinterpret_cast<void*>(aRegion), aSize, MADV_NORMAL)) {
     return true;
   } else {
     return false;
   }
 }
 
 static uintptr_t
 GetDesiredRegionSize()
--- a/mfbt/tests/TestPoisonArea.cpp
+++ b/mfbt/tests/TestPoisonArea.cpp
@@ -264,17 +264,17 @@ static void
 ReleaseRegion(void* aPage)
 {
   munmap(aPage, PageSize());
 }
 
 static bool
 ProbeRegion(uintptr_t aPage)
 {
-  return !!posix_madvise(reinterpret_cast<void*>(aPage), PageSize(), POSIX_MADV_NORMAL);
+  return !!madvise(reinterpret_cast<void*>(aPage), PageSize(), MADV_NORMAL);
 }
 
 static int
 MakeRegionExecutable(void* aPage)
 {
   return mprotect((caddr_t)aPage, PageSize(), PROT_READ|PROT_WRITE|PROT_EXEC);
 }