From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 12 Jul 2021 06:54:32 +0000 (-0700)
Subject: Pacify gcc -Woverflow more nicely
X-Git-Tag: emacs-28.0.90~1898
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da2f772fe575b20bff51b49aa5ded2bf15a2c89d;p=emacs.git

Pacify gcc -Woverflow more nicely

* src/alloc.c (mark_maybe_pointer): Simplify pacification
of gcc -Woverflow (unknown GCC version).
---

diff --git a/src/alloc.c b/src/alloc.c
index e3b038c51cd..ee3fd64a003 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4764,12 +4764,7 @@ mark_maybe_pointer (void *p, bool symbol_only)
 	 from Emacs source code, it can occur in some cases.  To fix
 	 this problem, the pdumper code should grok non-initial
 	 addresses, as the non-pdumper code does.  */
-#ifdef WIDE_EMACS_INT
-      uintptr_t mask = ~((uintptr_t) 0);
-#else
-      uintptr_t mask = VALMASK;
-#endif
-      void *po = (void *) ((uintptr_t) p & mask);
+      void *po = (void *) ((uintptr_t) p & (uintptr_t) VALMASK);
       char *cp = p;
       char *cpo = po;
       /* Don't use pdumper_object_p_precise here! It doesn't check the