diff options
author | Kostya Kortchinsky <kostyak@google.com> | 2018-07-03 19:03:46 +0000 |
---|---|---|
committer | Kostya Kortchinsky <kostyak@google.com> | 2018-07-03 19:03:46 +0000 |
commit | b68f1aed8ac49ce1a6763490ed861f3f1b12a982 (patch) | |
tree | b7f360c54cbfd50a808ebb0fa8cb788169067fb2 /lib/scudo | |
parent | 708223fe0d073d67e17a74f0303fe9d7dbead466 (diff) |
[scudo] Get rid of builtin-declaration-mismatch warnings
Summary:
The C interceptors were using `SIZE_T` defined in the interception library as
a `__sanitizer::uptr`. On some 32-bit platforms, this lead to the following
warning:
```
warning: declaration of ‘void* malloc(SIZE_T)’ conflicts with built-in declaration ‘void* malloc(unsigned int)’ [-Wbuiltin-declaration-mismatch]
INTERCEPTOR_ATTRIBUTE void *malloc(SIZE_T size) {
```
`__sanitizer::uptr` is indeed defined as an `unsigned long` on those.
So just include `stddef.h` and use `size_t` instead.
Reviewers: alekseyshl
Reviewed By: alekseyshl
Subscribers: delcypher, llvm-commits, #sanitizers
Differential Revision: https://reviews.llvm.org/D48885
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@336221 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/scudo')
-rw-r--r-- | lib/scudo/scudo_malloc.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/scudo/scudo_malloc.cpp b/lib/scudo/scudo_malloc.cpp index 6e83be422..91a77b365 100644 --- a/lib/scudo/scudo_malloc.cpp +++ b/lib/scudo/scudo_malloc.cpp @@ -16,6 +16,8 @@ #include "interception/interception.h" #include "sanitizer_common/sanitizer_platform_interceptors.h" +#include <stddef.h> + using namespace __scudo; extern "C" { @@ -23,24 +25,24 @@ INTERCEPTOR_ATTRIBUTE void free(void *ptr) { scudoDeallocate(ptr, 0, 0, FromMalloc); } -INTERCEPTOR_ATTRIBUTE void *malloc(SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *malloc(size_t size) { return scudoAllocate(size, 0, FromMalloc); } -INTERCEPTOR_ATTRIBUTE void *realloc(void *ptr, SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *realloc(void *ptr, size_t size) { return scudoRealloc(ptr, size); } -INTERCEPTOR_ATTRIBUTE void *calloc(SIZE_T nmemb, SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *calloc(size_t nmemb, size_t size) { return scudoCalloc(nmemb, size); } -INTERCEPTOR_ATTRIBUTE void *valloc(SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *valloc(size_t size) { return scudoValloc(size); } INTERCEPTOR_ATTRIBUTE -int posix_memalign(void **memptr, SIZE_T alignment, SIZE_T size) { +int posix_memalign(void **memptr, size_t alignment, size_t size) { return scudoPosixMemalign(memptr, alignment, size); } @@ -49,28 +51,28 @@ INTERCEPTOR_ATTRIBUTE void cfree(void *ptr) ALIAS("free"); #endif #if SANITIZER_INTERCEPT_MEMALIGN -INTERCEPTOR_ATTRIBUTE void *memalign(SIZE_T alignment, SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *memalign(size_t alignment, size_t size) { return scudoAllocate(size, alignment, FromMemalign); } INTERCEPTOR_ATTRIBUTE -void *__libc_memalign(SIZE_T alignment, SIZE_T size) ALIAS("memalign"); +void *__libc_memalign(size_t alignment, size_t size) ALIAS("memalign"); #endif #if SANITIZER_INTERCEPT_PVALLOC -INTERCEPTOR_ATTRIBUTE void *pvalloc(SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *pvalloc(size_t size) { return scudoPvalloc(size); } #endif #if SANITIZER_INTERCEPT_ALIGNED_ALLOC -INTERCEPTOR_ATTRIBUTE void *aligned_alloc(SIZE_T alignment, SIZE_T size) { +INTERCEPTOR_ATTRIBUTE void *aligned_alloc(size_t alignment, size_t size) { return scudoAlignedAlloc(alignment, size); } #endif #if SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE -INTERCEPTOR_ATTRIBUTE SIZE_T malloc_usable_size(void *ptr) { +INTERCEPTOR_ATTRIBUTE size_t malloc_usable_size(void *ptr) { return scudoMallocUsableSize(ptr); } #endif |