am 54c61d57: am b84783ec: Merge "Backing this one out since the counterpart needs to be sent upstream."

* commit '54c61d5715715ac7f1c6a4f7a53f981e09dc7134':
  Backing this one out since the counterpart needs to be sent upstream.

libc/bionic/malloc_debug_common.cpp

@@ -61,13 +61,9 @@ static const MallocDebug __libc_malloc_default_dispatch __attribute__((aligned(3
   Malloc(malloc_usable_size),
   Malloc(memalign),
   Malloc(posix_memalign),
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
   Malloc(pvalloc),
-#endif
   Malloc(realloc),
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
   Malloc(valloc),
-#endif
 };
 
 // Selector of dispatch table to use for dispatching malloc calls.
@@ -262,21 +258,17 @@ extern "C" int posix_memalign(void** memptr, size_t alignment, size_t size) {
   return __libc_malloc_dispatch->posix_memalign(memptr, alignment, size);
 }
 
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
 extern "C" void* pvalloc(size_t bytes) {
   return __libc_malloc_dispatch->pvalloc(bytes);
 }
-#endif
 
 extern "C" void* realloc(void* oldMem, size_t bytes) {
   return __libc_malloc_dispatch->realloc(oldMem, bytes);
 }
 
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
 extern "C" void* valloc(size_t bytes) {
   return __libc_malloc_dispatch->valloc(bytes);
 }
-#endif
 
 // We implement malloc debugging only in libc.so, so the code below
 // must be excluded if we compile this file for static libc.a
@@ -307,13 +299,9 @@ static void InitMalloc(void* malloc_impl_handler, MallocDebug* table, const char
   InitMallocFunction<MallocDebugMallocUsableSize>(malloc_impl_handler, &table->malloc_usable_size, prefix, "malloc_usable_size");
   InitMallocFunction<MallocDebugMemalign>(malloc_impl_handler, &table->memalign, prefix, "memalign");
   InitMallocFunction<MallocDebugPosixMemalign>(malloc_impl_handler, &table->posix_memalign, prefix, "posix_memalign");
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
   InitMallocFunction<MallocDebugPvalloc>(malloc_impl_handler, &table->pvalloc, prefix, "pvalloc");
-#endif
   InitMallocFunction<MallocDebugRealloc>(malloc_impl_handler, &table->realloc, prefix, "realloc");
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
   InitMallocFunction<MallocDebugValloc>(malloc_impl_handler, &table->valloc, prefix, "valloc");
-#endif
 }
 
 // Initializes memory allocation framework once per process.
@@ -459,14 +447,9 @@ static void malloc_init_impl() {
       (malloc_dispatch_table.malloc_usable_size == NULL) ||
       (malloc_dispatch_table.memalign == NULL) ||
       (malloc_dispatch_table.posix_memalign == NULL) ||
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
       (malloc_dispatch_table.pvalloc == NULL) ||
-#endif
-      (malloc_dispatch_table.realloc == NULL)
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
-      || (malloc_dispatch_table.valloc == NULL)
-#endif
-      ) {
+      (malloc_dispatch_table.realloc == NULL) ||
+      (malloc_dispatch_table.valloc == NULL)) {
     error_log("%s: some symbols for libc.debug.malloc level %d were not found (see above)",
               getprogname(), g_malloc_debug_level);
     dlclose(malloc_impl_handle);

libc/bionic/malloc_debug_common.h

@@ -61,12 +61,6 @@
 #define Malloc(function)  dl ## function
 #endif
 
-// valloc(3) and pvalloc(3) were removed from POSIX 2004. We do not include them
-// for LP64, but the symbols remain in LP32 for binary compatibility.
-#ifndef __LP64__
-#define HAVE_DEPRECATED_MALLOC_FUNCS 1
-#endif
-
 // =============================================================================
 // Structures
 // =============================================================================
@@ -96,14 +90,9 @@ typedef void* (*MallocDebugMalloc)(size_t);
 typedef size_t (*MallocDebugMallocUsableSize)(const void*);
 typedef void* (*MallocDebugMemalign)(size_t, size_t);
 typedef int (*MallocDebugPosixMemalign)(void**, size_t, size_t);
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
 typedef void* (*MallocDebugPvalloc)(size_t);
-#endif
 typedef void* (*MallocDebugRealloc)(void*, size_t);
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
 typedef void* (*MallocDebugValloc)(size_t);
-#endif
-
 struct MallocDebug {
   MallocDebugCalloc calloc;
   MallocDebugFree free;
@@ -112,13 +101,9 @@ struct MallocDebug {
   MallocDebugMallocUsableSize malloc_usable_size;
   MallocDebugMemalign memalign;
   MallocDebugPosixMemalign posix_memalign;
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
   MallocDebugPvalloc pvalloc;
-#endif
   MallocDebugRealloc realloc;
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
   MallocDebugValloc valloc;
-#endif
 };
 
 typedef bool (*MallocDebugInit)(HashTable*);

libc/include/malloc.h

@@ -35,6 +35,9 @@ extern void free(void* p);
 extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
+extern void* valloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
+extern void* pvalloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
+
 #ifndef STRUCT_MALLINFO_DECLARED
 #define STRUCT_MALLINFO_DECLARED 1
 struct mallinfo {

tests/Android.mk

@@ -115,18 +115,9 @@ libBionicStandardTests_src_files := \
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
-ifeq ($(MALLOC_IMPL),jemalloc)
-  libBionicStandardTests_cflags += -DUSE_JEMALLOC
-else
-  libBionicStandardTests_cflags += -DUSE_DLMALLOC
-endif
-
 libBionicStandardTests_cppflags := \
     $(test_cppflags) \
 
-libBionicStandardTests_c_includes := \
-    bionic/libc \
-
 libBionicStandardTests_ldlibs_host := \
     -lrt \
 

tests/malloc_test.cpp

@@ -22,10 +22,6 @@
 #include <malloc.h>
 #include <unistd.h>
 
-#if defined(__BIONIC__)
-#include <libc/bionic/malloc_debug_common.h>
-#endif
-
 TEST(malloc, malloc_std) {
   // Simple malloc test.
   void *ptr = malloc(100);
@@ -295,10 +291,6 @@ TEST(malloc, realloc_overflow) {
   free(ptr);
 }
 
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
-extern "C" void* pvalloc(size_t);
-extern "C" void* valloc(size_t);
-
 TEST(malloc, pvalloc_std) {
   size_t pagesize = sysconf(_SC_PAGESIZE);
   void* ptr = pvalloc(100);
@@ -323,4 +315,3 @@ TEST(malloc, valloc_std) {
 TEST(malloc, valloc_overflow) {
   ASSERT_EQ(NULL, valloc(SIZE_MAX));
 }
-#endif

tests/string_test.cpp

@@ -17,7 +17,6 @@
 #include <gtest/gtest.h>
 
 #include <errno.h>
-#include <malloc.h>
 #include <math.h>
 #include <string.h>
 
@@ -144,9 +143,9 @@ struct StringTestState {
     int max_alignment = 64;
 
     // TODO: fix the tests to not sometimes use twice their specified "MAX_LEN".
-    glob_ptr = reinterpret_cast<Character*>(memalign(sysconf(_SC_PAGESIZE), 2 * sizeof(Character) * MAX_LEN + max_alignment));
-    glob_ptr1 = reinterpret_cast<Character*>(memalign(sysconf(_SC_PAGESIZE), 2 * sizeof(Character) * MAX_LEN + max_alignment));
-    glob_ptr2 = reinterpret_cast<Character*>(memalign(sysconf(_SC_PAGESIZE), 2 * sizeof(Character) * MAX_LEN + max_alignment));
+    glob_ptr = reinterpret_cast<Character*>(valloc(2 * sizeof(Character) * MAX_LEN + max_alignment));
+    glob_ptr1 = reinterpret_cast<Character*>(valloc(2 * sizeof(Character) * MAX_LEN + max_alignment));
+    glob_ptr2 = reinterpret_cast<Character*>(valloc(2 * sizeof(Character) * MAX_LEN + max_alignment));
 
     InitLenArray();