allocator: Fix function type mismatch in allocator function definitions.

base/allocator/allocator_shim_override_glibc_weak_symbols.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifdef BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_GLIBC_WEAK_SYMBOLS_H_
 #error This header is meant to be included only once by allocator_shim.cc
 #endif
 #define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_GLIBC_WEAK_SYMBOLS_H_
 
 // Alias the internal Glibc symbols to the shim entry points.
@@ skipping 58 matching lines @@
                                                                   const void*) =
     &GlibcFreeHook;
 
 SHIM_ALWAYS_EXPORT void* (*MALLOC_HOOK_MAYBE_VOLATILE __memalign_hook)(
     size_t,
     size_t,
     const void*) = &GlibcMemalignHook;
 
 // 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"
 
 // Safety check.
 #if !defined(__GLIBC__)
 #error The target platform does not seem to use Glibc. Disable the allocator \
 shim by setting use_experimental_allocator_shim=false in GN args.
 #endif