Explicitly mark buffer_defaults and buffer_local_symbols.

* alloc.c (Fgarbage_collect): Mark buffer_defaults and
mark_local_symbols here.
(mark_object): If GC_CHECK_MARKED_OBJECTS, simplify checking
since special buffers aren't marked here any more.
(allocate_buffer): Chain new buffer with all_buffers here...
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): ...and
not here.
(Vbuffer_defaults, Vbuffer_local_symbols): Remove.
(syms_of_buffer): Remove staticpro of the above.
(init_buffer_once): Set names for buffer_defaults and
buffer_local_symbols.

1 files changed, 17 insertions, 13 deletions

diff --git a/src/alloc.c b/src/alloc.c
index aca0a82d1b5..1a9718bcb25 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -278,6 +278,7 @@ static void gc_sweep (void);
 static Lisp_Object make_pure_vector (ptrdiff_t);
 static void mark_glyph_matrix (struct glyph_matrix *);
 static void mark_face_cache (struct face_cache *);
+static void mark_buffer (struct buffer *);
 
 #if !defined REL_ALLOC || defined SYSTEM_MALLOC
 static void refill_memory_reserve (void);
@@ -3281,7 +3282,10 @@ allocate_buffer (void)
 
   XSETPVECTYPESIZE (b, PVEC_BUFFER, (offsetof (struct buffer, own_text)
                                      - header_size) / word_size);
-  /* Note that the fields of B are not initialized.  */
+  /* Put B on the chain of all buffers including killed ones.  */
+  b->header.next.buffer = all_buffers;
+  all_buffers = b;
+  /* Note that the rest fields of B are not initialized.  */
   return b;
 }
 
@@ -5473,6 +5477,9 @@ See Info node `(elisp)Garbage Collection'.  */)
 
   /* Mark all the special slots that serve as the roots of accessibility.  */
 
+  mark_buffer (&buffer_defaults);
+  mark_buffer (&buffer_local_symbols);
+
   for (i = 0; i < staticidx; i++)
     mark_object (*staticvec[i]);
 
@@ -5950,9 +5957,7 @@ mark_object (Lisp_Object arg)
 
 #ifdef GC_CHECK_MARKED_OBJECTS
         m = mem_find (po);
-        if (m == MEM_NIL && !SUBRP (obj)
-            && po != &buffer_defaults
-            && po != &buffer_local_symbols)
+        if (m == MEM_NIL && !SUBRP (obj))
           emacs_abort ();
 #endif /* GC_CHECK_MARKED_OBJECTS */
 
@@ -5969,15 +5974,14 @@ mark_object (Lisp_Object arg)
           {
           case PVEC_BUFFER:
 #ifdef GC_CHECK_MARKED_OBJECTS
-            if (po != &buffer_defaults && po != &buffer_local_symbols)
-              {
-                struct buffer *b;
-                FOR_EACH_BUFFER (b)
-                  if (b == po)
-                    break;
-                if (b == NULL)
-                  emacs_abort ();
-              }
+            {
+              struct buffer *b;
+              FOR_EACH_BUFFER (b)
+                if (b == po)
+                  break;
+              if (b == NULL)
+                emacs_abort ();
+            }
 #endif /* GC_CHECK_MARKED_OBJECTS */
             mark_buffer ((struct buffer *) ptr);
             break;