More GC assertions

diff --cc src/ChangeLog
index 0b03069c8d714e2c612208746878af913439dc48,f3cc322636c7f61d78ae13fbab97c77186079655..ea32a480a6c112655d27e9fe0087c8fee920bd03
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,5 -1,11 +1,9 @@@
 -2014-04-03  Daniel Colascione  <dancol@dancol.org>
 -
 -      * alloc.c (sweep_symbols,mark_object): Assert that symbol function
 -      cells contain valid lisp objects.  (Modified version of patch from
 -      Dmitry).
 +2014-04-08  Daniel Colascione  <dancol@dancol.org>
  
 -2014-04-03  Daniel Colascione  <dancol@dancol.org>
++      * alloc.c (sweep_symbols, mark_object): Assert that symbol
++      function cells contain valid lisp objects.  (Modified version of
++      patch from Dmitry).
+ 
        * alloc.c (detect_suspicious_free): Split actual stack capturing
        out into new function for easier breakpoint setting.
        (note_suspicious_free): New function.

diff --cc src/alloc.c
index d22e71bd1a89fa064d3ca2670ce34947db4721d0,a007a43457d71865e0f49b61c1e2d28cf529e7cc..15bfbbbb1b73b67cefa4a2983385ec0452874c4f
--- 1/src/alloc.c
--- 2/src/alloc.c
+++ b/src/alloc.c
@@@ -6639,7 -6600,11 +6641,9 @@@ sweep_symbols (void
            else
              {
                ++num_used;
 -              if (!pure_p)
 -                eassert (!STRING_MARKED_P (XSTRING (sym->s.name)));
                sym->s.gcmarkbit = 0;
+               /* Attempt to catch bogus objects.  */
+               eassert (valid_lisp_object_p (sym->s.function) >= 1);
              }
          }