aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Stephani2019-04-19 22:51:16 +0200
committerPhilipp Stephani2019-04-19 22:51:16 +0200
commit7e7d62ea5e1a33bdec82bce79ad27e10765e50f1 (patch)
treec127a602238ed0cce7531e4611d81999995207e1
parentba2e3a8abb5657e350d7653dd7580e1ebe84c7ab (diff)
downloademacs-7e7d62ea5e1a33bdec82bce79ad27e10765e50f1.tar.gz
emacs-7e7d62ea5e1a33bdec82bce79ad27e10765e50f1.zip
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.
-rw-r--r--src/alloc.c13
1 files 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)
4863 VALGRIND_MAKE_MEM_DEFINED (&p, sizeof (p)); 4863 VALGRIND_MAKE_MEM_DEFINED (&p, sizeof (p));
4864#endif 4864#endif
4865 4865
4866 if (sizeof (Lisp_Object) == sizeof (void *) || !HAVE_MODULES) 4866 if (!maybe_lisp_pointer (p))
4867 { 4867 return;
4868 if (!maybe_lisp_pointer (p))
4869 return;
4870 }
4871 else
4872 {
4873 /* For the wide-int case, also mark emacs_value tagged pointers,
4874 which can be generated by emacs-module.c's value_to_lisp. */
4875 p = (void *) ((uintptr_t) p & ~((1 << GCTYPEBITS) - 1));
4876 }
4877 4868
4878 if (pdumper_object_p (p)) 4869 if (pdumper_object_p (p))
4879 { 4870 {