commit 0c3224853b71a5ce42073d0012f2e7e9fe402a02
author Jason Molenda <jason@molenda.com> Thu May 25 18:05:10 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Thu May 25 18:10:22 2023 -0700
tree d5b99248d584d513edd11dd71dd6779db5a2eb1e
parent 5effccb101a1cf254f240d6953125148138daf44

Revert "[fuzzer] Don't hard-code page size in FuzzerUtil.h"

This reverts commit a2b677e8153758997a9043360cf51333eecc3c44.

reverting

Differential Revision: https://reviews.llvm.org/D140607

because <sys/auxv.h> and getauxval() are not available on macOS;
this change is breaking the mac CI bots.

GitOrigin-RevId: cb9f2de2e80292c0445c99be754fcc78b94b0f16

lib/fuzzer/FuzzerUtil.cpp

diff --git a/lib/fuzzer/FuzzerUtil.cpp b/lib/fuzzer/FuzzerUtil.cpp
index 4872463..aeab70f 100644
--- a/lib/fuzzer/FuzzerUtil.cpp
+++ b/lib/fuzzer/FuzzerUtil.cpp
@@ -19,7 +19,6 @@
 #include <signal.h>
 #include <sstream>
 #include <stdio.h>
-#include <sys/auxv.h>
 #include <sys/types.h>
 #include <thread>
 
@@ -235,9 +234,4 @@
   return Res;
 }
 
-size_t PageSize() {
-  static size_t PageSizeCached = getauxval(AT_PAGESZ);
-  return PageSizeCached;
-}
-
 }  // namespace fuzzer

lib/fuzzer/FuzzerUtil.h

diff --git a/lib/fuzzer/FuzzerUtil.h b/lib/fuzzer/FuzzerUtil.h
index 5296e77..71d4909 100644
--- a/lib/fuzzer/FuzzerUtil.h
+++ b/lib/fuzzer/FuzzerUtil.h
@@ -94,8 +94,7 @@
   return static_cast<size_t>((sizeof(unsigned long long) * 8) - Clzll(X) - 1);
 }
 
-size_t PageSize();
-
+inline size_t PageSize() { return 4096; }
 inline uint8_t *RoundUpByPage(uint8_t *P) {
   uintptr_t X = reinterpret_cast<uintptr_t>(P);
   size_t Mask = PageSize() - 1;