scratch/igc 7bd87c560d2 05/18: WIP

[Gerd Moellmann]

branch: scratch/igc
commit 7bd87c560d222b15672caa8bbb6f5b535019491e
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>

    WIP
---
 src/igc.c     |  4 ++++
 src/pdumper.c | 16 ++--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/igc.c b/src/igc.c
index 7149c5a157a..8c9ed6deafa 100644
--- a/src/igc.c
+++ b/src/igc.c
@@ -3334,6 +3334,10 @@ igc_finish_obj (void *client, char *base, char *end)
       return base + to_bytes (h->nwords);
     }
 
+  /* Some object in Emacs, e.g. built-in symbol, buffer_defaults,
+     main_thread.  These all will be memcpy'd to Emacs when a dump is
+     loaded, and are no longer useful. Make them padding. */
+  igc_assert (!pdumper_object_p (client));
   size_t client_size = end - base - sizeof *out;
   size_t nbytes = obj_size (client_size);
   size_t nwords = to_words (nbytes);
diff --git a/src/pdumper.c b/src/pdumper.c
index ef38cfd20f1..38c7229c64a 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -1396,20 +1396,8 @@ dump_enqueue_object (struct dump_context *ctx,
              is already on the normal queue: multiple enqueue calls
              can increase the object's weight.  */
          if (state == DUMP_OBJECT_ON_NORMAL_QUEUE)
-           {
-#if 0
-             if (XTYPE (object) == Lisp_Vectorlike)
-               {
-                 struct Lisp_Vector *v = XVECTOR (object);
-                 void *p = v;
-                 if (p == (void *) 0x000000017362d8a8)
-                   igc_break ();
-               }
-#endif
-
-             dump_queue_enqueue (&ctx->dump_queue, object, ctx->offset,
-                                 weight);
-           }
+           dump_queue_enqueue (&ctx->dump_queue, object, ctx->offset,
+                               weight);
         }
     }
   /* Always remember the path to this object.  */