Avoid gcc tautological-compare warnings.
This commit is contained in:
parent
3ea838d2a2
commit
0d6a472db9
@ -36,13 +36,25 @@
|
|||||||
zero); \
|
zero); \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
#define JEMALLOC_VALGRIND_REALLOC(maybe_moved, tsdn, ptr, usize, \
|
#define JEMALLOC_VALGRIND_REALLOC_MOVED_no(ptr, old_ptr) \
|
||||||
ptr_maybe_null, old_ptr, old_usize, old_rzsize, old_ptr_maybe_null, \
|
(false)
|
||||||
zero) do { \
|
#define JEMALLOC_VALGRIND_REALLOC_MOVED_maybe(ptr, old_ptr) \
|
||||||
|
((ptr) != (old_ptr))
|
||||||
|
#define JEMALLOC_VALGRIND_REALLOC_PTR_NULL_no(ptr) \
|
||||||
|
(false)
|
||||||
|
#define JEMALLOC_VALGRIND_REALLOC_PTR_NULL_maybe(ptr) \
|
||||||
|
(ptr == NULL)
|
||||||
|
#define JEMALLOC_VALGRIND_REALLOC_OLD_PTR_NULL_no(old_ptr) \
|
||||||
|
(false)
|
||||||
|
#define JEMALLOC_VALGRIND_REALLOC_OLD_PTR_NULL_maybe(old_ptr) \
|
||||||
|
(old_ptr == NULL)
|
||||||
|
#define JEMALLOC_VALGRIND_REALLOC(moved, tsdn, ptr, usize, ptr_null, \
|
||||||
|
old_ptr, old_usize, old_rzsize, old_ptr_null, zero) do { \
|
||||||
if (unlikely(in_valgrind)) { \
|
if (unlikely(in_valgrind)) { \
|
||||||
size_t rzsize = p2rz(tsdn, ptr); \
|
size_t rzsize = p2rz(tsdn, ptr); \
|
||||||
\
|
\
|
||||||
if (!maybe_moved || ptr == old_ptr) { \
|
if (!JEMALLOC_VALGRIND_REALLOC_MOVED_##moved(ptr, \
|
||||||
|
old_ptr)) { \
|
||||||
VALGRIND_RESIZEINPLACE_BLOCK(ptr, old_usize, \
|
VALGRIND_RESIZEINPLACE_BLOCK(ptr, old_usize, \
|
||||||
usize, rzsize); \
|
usize, rzsize); \
|
||||||
if (zero && old_usize < usize) { \
|
if (zero && old_usize < usize) { \
|
||||||
@ -51,11 +63,13 @@
|
|||||||
old_usize), usize - old_usize); \
|
old_usize), usize - old_usize); \
|
||||||
} \
|
} \
|
||||||
} else { \
|
} else { \
|
||||||
if (!old_ptr_maybe_null || old_ptr != NULL) { \
|
if (!JEMALLOC_VALGRIND_REALLOC_OLD_PTR_NULL_## \
|
||||||
|
old_ptr_null(old_ptr)) { \
|
||||||
valgrind_freelike_block(old_ptr, \
|
valgrind_freelike_block(old_ptr, \
|
||||||
old_rzsize); \
|
old_rzsize); \
|
||||||
} \
|
} \
|
||||||
if (!ptr_maybe_null || ptr != NULL) { \
|
if (!JEMALLOC_VALGRIND_REALLOC_PTR_NULL_## \
|
||||||
|
ptr_null(ptr)) { \
|
||||||
size_t copy_size = (old_usize < usize) \
|
size_t copy_size = (old_usize < usize) \
|
||||||
? old_usize : usize; \
|
? old_usize : usize; \
|
||||||
size_t tail_size = usize - copy_size; \
|
size_t tail_size = usize - copy_size; \
|
||||||
|
@ -1991,8 +1991,8 @@ je_realloc(void *ptr, size_t size)
|
|||||||
*tsd_thread_deallocatedp_get(tsd) += old_usize;
|
*tsd_thread_deallocatedp_get(tsd) += old_usize;
|
||||||
}
|
}
|
||||||
UTRACE(ptr, size, ret);
|
UTRACE(ptr, size, ret);
|
||||||
JEMALLOC_VALGRIND_REALLOC(true, tsdn, ret, usize, true, ptr, old_usize,
|
JEMALLOC_VALGRIND_REALLOC(maybe, tsdn, ret, usize, maybe, ptr,
|
||||||
old_rzsize, true, false);
|
old_usize, old_rzsize, maybe, false);
|
||||||
witness_assert_lockless(tsdn);
|
witness_assert_lockless(tsdn);
|
||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
@ -2418,8 +2418,8 @@ je_rallocx(void *ptr, size_t size, int flags)
|
|||||||
*tsd_thread_deallocatedp_get(tsd) += old_usize;
|
*tsd_thread_deallocatedp_get(tsd) += old_usize;
|
||||||
}
|
}
|
||||||
UTRACE(ptr, size, p);
|
UTRACE(ptr, size, p);
|
||||||
JEMALLOC_VALGRIND_REALLOC(true, tsd_tsdn(tsd), p, usize, false, ptr,
|
JEMALLOC_VALGRIND_REALLOC(maybe, tsd_tsdn(tsd), p, usize, no, ptr,
|
||||||
old_usize, old_rzsize, false, zero);
|
old_usize, old_rzsize, no, zero);
|
||||||
witness_assert_lockless(tsd_tsdn(tsd));
|
witness_assert_lockless(tsd_tsdn(tsd));
|
||||||
return (p);
|
return (p);
|
||||||
label_oom:
|
label_oom:
|
||||||
@ -2561,8 +2561,8 @@ je_xallocx(void *ptr, size_t size, size_t extra, int flags)
|
|||||||
*tsd_thread_allocatedp_get(tsd) += usize;
|
*tsd_thread_allocatedp_get(tsd) += usize;
|
||||||
*tsd_thread_deallocatedp_get(tsd) += old_usize;
|
*tsd_thread_deallocatedp_get(tsd) += old_usize;
|
||||||
}
|
}
|
||||||
JEMALLOC_VALGRIND_REALLOC(false, tsd_tsdn(tsd), ptr, usize, false, ptr,
|
JEMALLOC_VALGRIND_REALLOC(no, tsd_tsdn(tsd), ptr, usize, no, ptr,
|
||||||
old_usize, old_rzsize, false, zero);
|
old_usize, old_rzsize, no, zero);
|
||||||
label_not_resized:
|
label_not_resized:
|
||||||
UTRACE(ptr, size, ptr);
|
UTRACE(ptr, size, ptr);
|
||||||
witness_assert_lockless(tsd_tsdn(tsd));
|
witness_assert_lockless(tsd_tsdn(tsd));
|
||||||
|
Loading…
Reference in New Issue
Block a user