1 files changed, 5 insertions, 1 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 9d0e2d37e3c..c3f7920ed87 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4983,7 +4983,11 @@ mark_memory (void *start, void *end)
   for (pp = start; (void *) pp < end; pp += GC_POINTER_ALIGNMENT)
     {
       mark_maybe_pointer (*(void **) pp);
-      mark_maybe_object (*(Lisp_Object *) pp);
+
+      verify (alignof (Lisp_Object) % GC_POINTER_ALIGNMENT == 0);
+      if (alignof (Lisp_Object) == GC_POINTER_ALIGNMENT
+          || (uintptr_t) pp % alignof (Lisp_Object) == 0)
+        mark_maybe_object (*(Lisp_Object *) pp);
     }
 }