* src/pdumper.c (Fdump_emacs_portable): Simplify commit 16a16645f524

(cherry picked from commit 3c4b6823c3f92291888a24b7fee40de82bb92d68)

diff --git a/src/pdumper.c b/src/pdumper.c
index 6d0abc5d83555e86dca87ced5eb9455446dc6f6d..e1c71ae56c03fe30cc632eab51e484bdfeda0201 100644 (file)
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4226,22 +4226,19 @@ types.  */)
       dump_drain_deferred_symbols (ctx);
       dump_drain_normal_queue (ctx);
     }
-  while (!dump_queue_empty_p (&ctx->dump_queue)
-        || !NILP (ctx->deferred_hash_tables)
-        || !NILP (ctx->deferred_symbols));
+  while (!(dump_queue_empty_p (&ctx->dump_queue)
+          && NILP (ctx->deferred_hash_tables)
+          && NILP (ctx->deferred_symbols)));
 
   ctx->header.hash_list = ctx->offset;
   dump_hash_table_list (ctx);
 
-  do
-    {
-      dump_drain_deferred_hash_tables (ctx);
-      dump_drain_deferred_symbols (ctx);
-      dump_drain_normal_queue (ctx);
-    }
-  while (!dump_queue_empty_p (&ctx->dump_queue)
-        || !NILP (ctx->deferred_hash_tables)
-        || !NILP (ctx->deferred_symbols));
+  /* `dump_hash_table_list` just adds a new vector to the dump but all its
+     content should already have been in the dump, so it doesn't add anything
+     to any queue.  */
+  eassert (dump_queue_empty_p (&ctx->dump_queue)
+          && NILP (ctx->deferred_hash_tables)
+          && NILP (ctx->deferred_symbols));
 
   dump_sort_copied_objects (ctx);