allocator: Fix function type mismatch in allocator function definitions.

base/allocator/allocator_shim_override_glibc_weak_symbols.h

Index: base/allocator/allocator_shim_override_glibc_weak_symbols.h
diff --git a/base/allocator/allocator_shim_override_glibc_weak_symbols.h b/base/allocator/allocator_shim_override_glibc_weak_symbols.h
index a0b46183fc3c1601df6ad24aca9eb82766afcf81..2d925f3f9dbca8a0a766c751f53f58fa87a1fe9b 100644
--- a/base/allocator/allocator_shim_override_glibc_weak_symbols.h
+++ b/base/allocator/allocator_shim_override_glibc_weak_symbols.h
@@ -76,30 +76,27 @@ SHIM_ALWAYS_EXPORT void* (*MALLOC_HOOK_MAYBE_VOLATILE __memalign_hook)(
 
 // 2) Redefine libc symbols themselves.
 
-SHIM_ALWAYS_EXPORT void* __libc_malloc(size_t size)
-    SHIM_ALIAS_SYMBOL(ShimMalloc);
+SHIM_ALWAYS_EXPORT void* __libc_malloc(size_t size) SHIM_ALIAS_SYMBOL(malloc);

[Primiano Tucci (use gerrit), 2017/02/28 12:18:49]

honestly if we go down this road (i.e. adding an extra explicit hop) I'd prefer
this to just be an explicit functon call (like the other file) instead of this
alias.
Rationale:
- this alias won't really reduce one hop, just reuse the same hop below
- this makes this code very hard to read and reason about, as one have to
realize that "malloc" is actually redefined in the other file and is just
jumping into shimmalloc.

[pcc1, 2017/02/28 22:27:35]

Done, as discussed on crbug.com/696986

 
-SHIM_ALWAYS_EXPORT void __libc_free(void* ptr) SHIM_ALIAS_SYMBOL(ShimFree);
+SHIM_ALWAYS_EXPORT void __libc_free(void* ptr) SHIM_ALIAS_SYMBOL(free);
 
 SHIM_ALWAYS_EXPORT void* __libc_realloc(void* ptr, size_t size)
-    SHIM_ALIAS_SYMBOL(ShimRealloc);
+    SHIM_ALIAS_SYMBOL(realloc);
 
 SHIM_ALWAYS_EXPORT void* __libc_calloc(size_t n, size_t size)
-    SHIM_ALIAS_SYMBOL(ShimCalloc);
+    SHIM_ALIAS_SYMBOL(calloc);
 
-SHIM_ALWAYS_EXPORT void __libc_cfree(void* ptr) SHIM_ALIAS_SYMBOL(ShimFree);
+SHIM_ALWAYS_EXPORT void __libc_cfree(void* ptr) SHIM_ALIAS_SYMBOL(cfree);
 
 SHIM_ALWAYS_EXPORT void* __libc_memalign(size_t align, size_t s)
-    SHIM_ALIAS_SYMBOL(ShimMemalign);
+    SHIM_ALIAS_SYMBOL(memalign);
 
-SHIM_ALWAYS_EXPORT void* __libc_valloc(size_t size)
-    SHIM_ALIAS_SYMBOL(ShimValloc);
+SHIM_ALWAYS_EXPORT void* __libc_valloc(size_t size) SHIM_ALIAS_SYMBOL(valloc);
 
-SHIM_ALWAYS_EXPORT void* __libc_pvalloc(size_t size)
-    SHIM_ALIAS_SYMBOL(ShimPvalloc);
+SHIM_ALWAYS_EXPORT void* __libc_pvalloc(size_t size) SHIM_ALIAS_SYMBOL(pvalloc);
 
 SHIM_ALWAYS_EXPORT int __posix_memalign(void** r, size_t a, size_t s)
-    SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
+    SHIM_ALIAS_SYMBOL(posix_memalign);
 
 }  // extern "C"