[scudo] Check support for pvalloc/valloc tests.

[cferris]

Summary

Some platforms do not support pvalloc/valloc so add checks so
that these tests are only run on the appropriate platforms.

[cferris]

Fix location of test file.

[Chia-hungDuan]

Just curious, why didn't this cause problem on Android before?

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

31

Hope this make it easier to read

[cferris]

More readable.

[cferris]

We aren't compiling this in Android yet. I think there was a problem and we just never went back and fixed it.

[Chia-hungDuan]

In D152756#4415728, @cferris wrote:

We aren't compiling this in Android yet. I think there was a problem and we just never went back and fixed it.

Got it! Thanks for the explanation

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

 #include <malloc.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #ifndef __GLIBC_PREREQ
 #define __GLIBC_PREREQ(x, y) 0
 #endif
 
+#if SCUDO_FUCHSIA
+// Fuchsia only has valloc
+#define HAVE_VALLOC 1
+#elif SCUDO_ANDROID
+// Android only has pvalloc/valloc on 32 bit
+#if !defined(__LP64__)
+#define HAVE_PVALLOC 1
+#define HAVE_VALLOC 1
+#endif // !defined(__LP64__)
+#else
+// All others assumed to support both functions.
+#define HAVE_PVALLOC 1
+#define HAVE_VALLOC 1
+#endif
+
 extern "C" {
 void malloc_enable(void);
 void malloc_disable(void);
 int malloc_iterate(uintptr_t base, size_t size,
                    void (*callback)(uintptr_t base, size_t size, void *arg),
                    void *arg);
 void *valloc(size_t size);
 void *pvalloc(size_t size);
if (SCUDO_ANDROID) {
     EXPECT_EQ(mallopt(M_CACHE_COUNT_MAX, 100), 1);
     EXPECT_EQ(mallopt(M_CACHE_SIZE_MAX, 1024 * 1024 * 2), 1);
     EXPECT_EQ(mallopt(M_TSDS_COUNT_MAX, 10), 1);
   }
 }
 #endif
 
 TEST(ScudoWrappersCTest, OtherAlloc) {
-#if !SCUDO_FUCHSIA
+#if HAVE_PVALLOC
   const size_t PageSize = sysconf(_SC_PAGESIZE);
 
   void *P = pvalloc(Size);
   EXPECT_NE(P, nullptr);
   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) & (PageSize - 1), 0U);
   EXPECT_LE(PageSize, malloc_usable_size(P));
   free(P);
 
   EXPECT_EQ(pvalloc(SIZE_MAX), nullptr);
 
   P = pvalloc(Size);
   EXPECT_NE(P, nullptr);
   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) & (PageSize - 1), 0U);
   free(P);
 #endif
 
+#if HAVE_VALLOC
   EXPECT_EQ(valloc(SIZE_MAX), nullptr);
+#endif
 }
 
 #if !SCUDO_FUCHSIA
 TEST(ScudoWrappersCTest, MallInfo) {
   // mallinfo is deprecated.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
   const size_t BypassQuarantineSize = 1024U;