From 7e7d62ea5e1a33bdec82bce79ad27e10765e50f1 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <phst@google.com>
Date: Fri, 19 Apr 2019 22:51:16 +0200
Subject: [PATCH] Remove special-casing of tagged pointers.

This partially reverts commit
09b2b8a5ce5b542856f93b645db51eb11cf9855a.

* src/alloc.c (mark_maybe_pointer): Remove special-casing of tagged
pointers.  After commit 09d746dad36e4780d379f975a84b1b076da78c50,
modules no longer rely on tagged pointers.
---
 src/alloc.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/alloc.c b/src/alloc.c
index dd783863be8..70701d75d47 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4863,17 +4863,8 @@ mark_maybe_pointer (void *p)
   VALGRIND_MAKE_MEM_DEFINED (&p, sizeof (p));
 #endif
 
-  if (sizeof (Lisp_Object) == sizeof (void *) || !HAVE_MODULES)
-    {
-      if (!maybe_lisp_pointer (p))
-        return;
-    }
-  else
-    {
-      /* For the wide-int case, also mark emacs_value tagged pointers,
-	 which can be generated by emacs-module.c's value_to_lisp.  */
-      p = (void *) ((uintptr_t) p & ~((1 << GCTYPEBITS) - 1));
-    }
+  if (!maybe_lisp_pointer (p))
+    return;
 
   if (pdumper_object_p (p))
     {
-- 
2.39.5