diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 10:36:12 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 10:36:12 +0100 |
| commit | a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a (patch) | |
| tree | 630daf21227a6fcd6466f65d70f5809928e2c8b2 /include | |
| parent | e6fcd7230954c6111bba63e7f7201fc81e50178e (diff) | |
| parent | ad220b96fb01dbb6acf7e51bdd8d4d6362d96ea7 (diff) | |
| download | mariadb-git-a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_valgrind.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 5d08a271d4a..a85e610f049 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -42,7 +42,7 @@ https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) # define MEM_CHECK_DEFINED(a,len) ((void) 0) #else -# define MEM_UNDEFINED(a,len) ((void) 0) +# define MEM_UNDEFINED(a,len) ((void) (a), (void) (len)) # define MEM_NOACCESS(a,len) ((void) 0) # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) # define MEM_CHECK_DEFINED(a,len) ((void) 0) @@ -51,7 +51,7 @@ https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ #ifndef DBUG_OFF #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); MEM_UNDEFINED(A, trash_tmp); memset(A, C, trash_tmp); } while (0) #else -#define TRASH_FILL(A,B,C) do { const size_t trash_tmp __attribute__((unused))= (B); MEM_UNDEFINED(A,trash_tmp); } while (0) +#define TRASH_FILL(A,B,C) do { MEM_UNDEFINED((A), (B)); } while (0) #endif #define TRASH_ALLOC(A,B) do { TRASH_FILL(A,B,0xA5); MEM_UNDEFINED(A,B); } while(0) #define TRASH_FREE(A,B) do { TRASH_FILL(A,B,0x8F); MEM_NOACCESS(A,B); } while(0) |