Re: scratch/igc lread testsuite error [was Re: scratch/igc warning]

[Helmut Eller <eller.helmut@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

On Wed, Jun 26 2024, Andrea Corallo wrote:

> I can bootstrap fine scratch/igc with nativecomp, and make check shows
> here only one fail, 'lread-circle' in src/lread-tests.log.

This should be fixed by:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Small-fixes-for-dumper.patch --]
[-- Type: text/x-diff, Size: 1436 bytes --]

From d68b4c832268ef2fe478ae9f77b3286406a4cdaa Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Thu, 27 Jun 2024 08:38:56 +0200
Subject: [PATCH 1/2] Small fixes for dumper

* src/pdumper.c (dump_subr): Use dump_field_lv for command_modes.
(dump_igc_start_obj): DUMP_ALIGNMENT seems more appropriate than
igc_header_size.
---
 src/pdumper.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pdumper.c b/src/pdumper.c
index 667f75ef6bf..4dfe38d0d8c 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -903,7 +903,7 @@ dump_igc_start_obj (struct dump_context *ctx, enum igc_obj_type type,
 {
   eassert (ctx->igc_type == IGC_OBJ_INVALID);
   eassert (ctx->igc_obj_dumped == NULL);
-  eassert (ctx->offset % igc_header_size () == 0);
+  eassert (ctx->offset % DUMP_ALIGNMENT == 0);
   ctx->igc_obj_dumped = (void *) in;
   ctx->igc_type = type;
   ctx->igc_base_offset = ctx->offset;
@@ -3033,7 +3033,8 @@ dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr)
     {
       dump_field_emacs_ptr (ctx, &out, subr, &subr->symbol_name);
       dump_field_emacs_ptr (ctx, &out, subr, &subr->intspec.string);
-      dump_field_emacs_ptr (ctx, &out, subr, &subr->command_modes);
+      eassert (NILP (subr->command_modes));
+      dump_field_lv (ctx, &out, subr, &subr->command_modes, WEIGHT_NORMAL);
     }
   DUMP_FIELD_COPY (&out, subr, doc);
 #ifdef HAVE_NATIVE_COMP
-- 
2.39.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Fix-lread-tests.patch --]
[-- Type: text/x-diff, Size: 1178 bytes --]

From 43d5bbe504f2ae86e206ced42bb7b2bbf104e29f Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Thu, 27 Jun 2024 08:55:30 +0200
Subject: [PATCH 2/2] Fix lread-tests

* src/print.c (pp_stack_pop): Pop values from left to right.
---
 src/print.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/print.c b/src/print.c
index d2b4a586e6c..146cd7bd8c6 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1402,8 +1402,9 @@ pp_stack_push_values (Lisp_Object vectorlike, ptrdiff_t start, ptrdiff_t n)
     return;
   if (ppstack.sp >= ppstack.size)
     grow_pp_stack ();
-  ppstack.stack[ppstack.sp++]
-    = (struct print_pp_entry){ .start = start, .n = n, .u.vectorlike = vectorlike };
+  ppstack.stack[ppstack.sp++] = (struct print_pp_entry){
+    .start = start, .n = n, .u.vectorlike = vectorlike
+  };
   ppstack.stack[ppstack.sp - 1].is_free = false;
 }
 #else
@@ -1444,7 +1445,8 @@ pp_stack_pop (void)
   e->n--;
   Lisp_Object result;
 #ifdef HAVE_MPS
-  result = AREF (e->u.vectorlike, e->start + e->n);
+  result = AREF (e->u.vectorlike, e->start);
+  e->start++;
 #else
   result = (++e->u.values)[-1];
 #endif
-- 
2.39.2