[compiler-rt] 6ee594b - Revert "[scudo] Fix MallocIterateBoundary on 32 bit."

[Christopher Ferris via llvm-commits]

Author: Christopher Ferris
Date: 2023-06-13T00:15:16-07:00
New Revision: 6ee594be53e7efaa12086ad20f0d0268092a4c73

URL: https://github.com/llvm/llvm-project/commit/6ee594be53e7efaa12086ad20f0d0268092a4c73
DIFF: https://github.com/llvm/llvm-project/commit/6ee594be53e7efaa12086ad20f0d0268092a4c73.diff

LOG: Revert "[scudo] Fix MallocIterateBoundary on 32 bit."

This reverts commit 5e691a1c9b0ad22689d4a434ddf4fed940e58dec.

Reviewed By: cferris

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

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp b/compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp
index 26bab8d984fd7..05d1d4826bd55 100644
--- a/compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp
@@ -333,7 +333,7 @@ static void callback(uintptr_t Base, size_t Size, void *Arg) {
 // block is a boundary for. It must only be seen once by the callback function.
 TEST(ScudoWrappersCTest, MallocIterateBoundary) {
   const size_t PageSize = sysconf(_SC_PAGESIZE);
-  const size_t BlockDelta = 16U;
+  const size_t BlockDelta = FIRST_32_SECOND_64(8U, 16U);
   const size_t SpecialSize = PageSize - BlockDelta;
 
   // We aren't guaranteed that any size class is exactly a page wide. So we need