61 lines
3.0 KiB
Diff
61 lines
3.0 KiB
Diff
|
From 45908e4d120d33a558a8b052036c56cd0c90b898 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Yves Orton <demerphq@gmail.com>
|
|||
|
|
Date: Wed, 13 Sep 2017 13:30:25 +0200
|
|||
|
|
Subject: [PATCH] avoid 'the address of ... will always evaluate as ...' warns
|
|||
|
|
in mem macros
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
In f14cf363205 we added asserts to our memory macros (Copy(), Zero() etc)
|
|||
|
|
to ensure that the target is non-null. These asserts throw warnings like
|
|||
|
|
|
|||
|
|
perl.c: In function ‘Perl_eval_sv’:
|
|||
|
|
perl.c:2976:264: warning: the address of ‘myop’ will always evaluate
|
|||
|
|
as ‘true’ [-Waddress]
|
|||
|
|
Zero(&myop, 1, UNOP);
|
|||
|
|
|
|||
|
|
which is annoying. This patch changes how these asserts are coded so
|
|||
|
|
we avoid the warning. Thanks to Zefram for the fix.
|
|||
|
|
|
|||
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|||
|
|
---
|
|||
|
|
handy.h | 17 ++++++++++-------
|
|||
|
|
1 file changed, 10 insertions(+), 7 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/handy.h b/handy.h
|
|||
|
|
index 31afaae65e..85e8f70721 100644
|
|||
|
|
--- a/handy.h
|
|||
|
|
+++ b/handy.h
|
|||
|
|
@@ -2409,17 +2409,20 @@ void Perl_mem_log_del_sv(const SV *sv, const char *filename, const int linenumbe
|
|||
|
|
#define Safefree(d) safefree(MEM_LOG_FREE((Malloc_t)(d)))
|
|||
|
|
#endif
|
|||
|
|
|
|||
|
|
-#define Move(s,d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), assert(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
-#define Copy(s,d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), assert(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
-#define Zero(d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), (void)memzero((char*)(d), (n) * sizeof(t)))
|
|||
|
|
+#define perl_assert_ptr(p) assert( ((void*)(p)) != 0 )
|
|||
|
|
|
|||
|
|
-#define MoveD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), assert(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
-#define CopyD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), assert(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
+
|
|||
|
|
+#define Move(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
+#define Copy(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
+#define Zero(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
|
|||
|
|
+
|
|||
|
|
+#define MoveD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
+#define CopyD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
|
|||
|
|
#ifdef HAS_MEMSET
|
|||
|
|
-#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), memzero((char*)(d), (n) * sizeof(t)))
|
|||
|
|
+#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
|
|||
|
|
#else
|
|||
|
|
/* Using bzero(), which returns void. */
|
|||
|
|
-#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) assert(d), memzero((char*)(d), (n) * sizeof(t)),d)
|
|||
|
|
+#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)),d)
|
|||
|
|
#endif
|
|||
|
|
|
|||
|
|
#define PoisonWith(d,n,t,b) (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
|
|||
|
|
--
|
|||
|
|
2.13.6
|
|||
|
|
|