scratch/igc warning

scratch/igc warning

[Andrea Corallo]

Hi,

GCC 12.3 is giving me this warning building scratch/igc:

========
  CC       xfaces.o
In file included from /usr/include/string.h:535,
                 from ../lib/string.h:41,
                 from lisp.h:29,
                 from xfaces.c:226:
In function ‘memset’,
    inlined from ‘make_realized_face’ at xfaces.c:4581:3,
    inlined from ‘realize_gui_face’ at xfaces.c:6214:10,
    inlined from ‘realize_face’ at xfaces.c:6124:12:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
   59 |   return __builtin___memset_chk (__dest, __ch, __len,
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   60 |                                  __glibc_objsize0 (__dest));
      |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from termhooks.h:27,
                 from frame.h:22,
                 from xfaces.c:229:
dispextern.h: In function ‘realize_face’:
dispextern.h:1730:7: note: subobject ‘id’ declared here
 1730 |   int id;
      |       ^~
In function ‘memset’,
    inlined from ‘make_realized_face’ at xfaces.c:4581:3,
    inlined from ‘realize_tty_face’ at xfaces.c:6641:10,
    inlined from ‘realize_face’ at xfaces.c:6126:12:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
   59 |   return __builtin___memset_chk (__dest, __ch, __len,
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   60 |                                  __glibc_objsize0 (__dest));
      |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
dispextern.h: In function ‘realize_face’:
dispextern.h:1730:7: note: subobject ‘id’ declared here
 1730 |   int id;
      |       ^~
In function ‘memset’,
    inlined from ‘make_realized_face’ at xfaces.c:4581:3,
    inlined from ‘realize_face’ at xfaces.c:6130:14:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
   59 |   return __builtin___memset_chk (__dest, __ch, __len,
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   60 |                                  __glibc_objsize0 (__dest));
      |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
dispextern.h: In function ‘realize_face’:
dispextern.h:1730:7: note: subobject ‘id’ declared here
 1730 |   int id;
      |       ^~
========

ATM don't know if it's a real issue or a false positive so I thought was
worth mentioning.

  Andrea

Re: scratch/igc warning

[Pip Cet]

On Wednesday, June 26th, 2024 at 14:08, Andrea Corallo <acorallo@gnu.org> wrote:

> GCC 12.3 is giving me this warning building scratch/igc:
> 
> ========
> CC xfaces.o
> In file included from /usr/include/string.h:535,
> from ../lib/string.h:41,
> from lisp.h:29,
> from xfaces.c:226:
> In function ‘memset’,
> inlined from ‘make_realized_face’ at xfaces.c:4581:3,
> inlined from ‘realize_gui_face’ at xfaces.c:6214:10,
> inlined from ‘realize_face’ at xfaces.c:6124:12:
> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
> 59 | return __builtin___memset_chk (__dest, __ch, __len,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 60 | __glibc_objsize0 (__dest));
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from termhooks.h:27,
> from frame.h:22,
> from xfaces.c:229:
> dispextern.h: In function ‘realize_face’:
> dispextern.h:1730:7: note: subobject ‘id’ declared here
> 1730 | int id;
> | ^~
> In function ‘memset’,
> inlined from ‘make_realized_face’ at xfaces.c:4581:3,
> inlined from ‘realize_tty_face’ at xfaces.c:6641:10,
> inlined from ‘realize_face’ at xfaces.c:6126:12:
> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
> 59 | return __builtin___memset_chk (__dest, __ch, __len,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 60 | __glibc_objsize0 (__dest));
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~
> dispextern.h: In function ‘realize_face’:
> dispextern.h:1730:7: note: subobject ‘id’ declared here
> 1730 | int id;
> | ^~
> In function ‘memset’,
> inlined from ‘make_realized_face’ at xfaces.c:4581:3,
> inlined from ‘realize_face’ at xfaces.c:6130:14:
> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
> 59 | return __builtin___memset_chk (__dest, __ch, __len,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 60 | __glibc_objsize0 (__dest));
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~
> dispextern.h: In function ‘realize_face’:
> dispextern.h:1730:7: note: subobject ‘id’ declared here
> 1730 | int id;
> | ^~
> ========
> 
> ATM don't know if it's a real issue or a false positive so I thought was
> worth mentioning.

Something in between: the code is trying to clear a struct partially by memsetting starting from a given offset to the end of the struct. However, it's not specific to the igc branch.

Pip

Re: scratch/igc warning

[Andrea Corallo]

Pip Cet <pipcet@protonmail.com> writes:

> On Wednesday, June 26th, 2024 at 14:08, Andrea Corallo <acorallo@gnu.org> wrote:
>
>> GCC 12.3 is giving me this warning building scratch/igc:
>> 
>> ========
>> CC xfaces.o
>> In file included from /usr/include/string.h:535,
>> from ../lib/string.h:41,
>> from lisp.h:29,
>> from xfaces.c:226:
>> In function ‘memset’,
>> inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>> inlined from ‘realize_gui_face’ at xfaces.c:6214:10,
>> inlined from ‘realize_face’ at xfaces.c:6124:12:
>> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>> 59 | return __builtin___memset_chk (__dest, __ch, __len,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> 60 | __glibc_objsize0 (__dest));
>> | ~~~~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from termhooks.h:27,
>> from frame.h:22,
>> from xfaces.c:229:
>> dispextern.h: In function ‘realize_face’:
>> dispextern.h:1730:7: note: subobject ‘id’ declared here
>> 1730 | int id;
>> | ^~
>> In function ‘memset’,
>> inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>> inlined from ‘realize_tty_face’ at xfaces.c:6641:10,
>> inlined from ‘realize_face’ at xfaces.c:6126:12:
>> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>> 59 | return __builtin___memset_chk (__dest, __ch, __len,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> 60 | __glibc_objsize0 (__dest));
>> | ~~~~~~~~~~~~~~~~~~~~~~~~~~
>> dispextern.h: In function ‘realize_face’:
>> dispextern.h:1730:7: note: subobject ‘id’ declared here
>> 1730 | int id;
>> | ^~
>> In function ‘memset’,
>> inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>> inlined from ‘realize_face’ at xfaces.c:6130:14:
>> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>> 59 | return __builtin___memset_chk (__dest, __ch, __len,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> 60 | __glibc_objsize0 (__dest));
>> | ~~~~~~~~~~~~~~~~~~~~~~~~~~
>> dispextern.h: In function ‘realize_face’:
>> dispextern.h:1730:7: note: subobject ‘id’ declared here
>> 1730 | int id;
>> | ^~
>> ========
>> 
>> ATM don't know if it's a real issue or a false positive so I thought was
>> worth mentioning.
>
> Something in between: the code is trying to clear a struct partially by memsetting starting from a given offset to the end of the struct. However, it's not specific to the igc branch.

I believe it is, I don't see it in my other builds.

  Andrea

Re: scratch/igc warning

[Pip Cet]

On Wednesday, June 26th, 2024 at 14:43, Andrea Corallo <acorallo@gnu.org> wrote:

> > Something in between: the code is trying to clear a struct partially by memsetting starting from a given offset to the end of the struct. However, it's not specific to the igc branch.
> 
> 
> I believe it is, I don't see it in my other builds.

I meant the issue, if there is one, isn't specific to the igc branch. The GCC warning appears to be specific to allocation functions not declared with the attributes provided by ATTRIBUTE_MALLOC_SIZE ((1)). If I remove that attribute from xmalloc on the master branch and enable fortification, I see the warning there, as well.

Pip

Re: scratch/igc warning

[Gerd Möllmann]

Andrea Corallo <acorallo@gnu.org> writes:

> Hi,
>
> GCC 12.3 is giving me this warning building scratch/igc:
>
> ========
>   CC       xfaces.o
> In file included from /usr/include/string.h:535,
>                  from ../lib/string.h:41,
>                  from lisp.h:29,
>                  from xfaces.c:226:
> In function ‘memset’,
>     inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>     inlined from ‘realize_gui_face’ at xfaces.c:6214:10,
>     inlined from ‘realize_face’ at xfaces.c:6124:12:
> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>    59 |   return __builtin___memset_chk (__dest, __ch, __len,
>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    60 |                                  __glibc_objsize0 (__dest));
>       |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from termhooks.h:27,
>                  from frame.h:22,
>                  from xfaces.c:229:
> dispextern.h: In function ‘realize_face’:
> dispextern.h:1730:7: note: subobject ‘id’ declared here
>  1730 |   int id;
>       |       ^~
> In function ‘memset’,
>     inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>     inlined from ‘realize_tty_face’ at xfaces.c:6641:10,
>     inlined from ‘realize_face’ at xfaces.c:6126:12:
> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>    59 |   return __builtin___memset_chk (__dest, __ch, __len,
>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    60 |                                  __glibc_objsize0 (__dest));
>       |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
> dispextern.h: In function ‘realize_face’:
> dispextern.h:1730:7: note: subobject ‘id’ declared here
>  1730 |   int id;
>       |       ^~
> In function ‘memset’,
>     inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>     inlined from ‘realize_face’ at xfaces.c:6130:14:
> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>    59 |   return __builtin___memset_chk (__dest, __ch, __len,
>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    60 |                                  __glibc_objsize0 (__dest));
>       |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
> dispextern.h: In function ‘realize_face’:
> dispextern.h:1730:7: note: subobject ‘id’ declared here
>  1730 |   int id;
>       |       ^~
> ========
>
> ATM don't know if it's a real issue or a false positive so I thought was
> worth mentioning.

Hm, that's this one, right?

  static struct face *
  make_realized_face (Lisp_Object *attr)
  {
    enum { off = offsetof (struct face, id) };
  #ifdef HAVE_MPS
    struct face *face = igc_make_face ();
  #else
    struct face *face = xmalloc (sizeof *face);
  #endif
    memcpy (face->lface, attr, sizeof face->lface);
    memset (&face->id, 0, sizeof *face - off);
    face->ascii_face = face;

    return face;
  }

which we can rewrite, for MPS

  static struct face *
  make_realized_face (Lisp_Object *attr)
  {
  #ifdef HAVE_MPS
    struct face *face = igc_make_face ();
    memcpy (face->lface, attr, sizeof face->lface);
  #else
    enum { off = offsetof (struct face, id) };
    struct face *face = xmalloc (sizeof *face);
    memcpy (face->lface, attr, sizeof face->lface);
    memset (&face->id, 0, sizeof *face - off);
  #endif
    face->ascii_face = face;

    return face;
  }

because igc returns something zero-initialized anyway. (I'll do that.).

But I wonder - does GCC 12 also complain for the non-MPS case?

Re: scratch/igc warning

[Andrea Corallo]

Gerd Möllmann <gerd.moellmann@gmail.com> writes:

> Andrea Corallo <acorallo@gnu.org> writes:
>
>> Hi,
>>
>> GCC 12.3 is giving me this warning building scratch/igc:
>>
>> ========
>>   CC       xfaces.o
>> In file included from /usr/include/string.h:535,
>>                  from ../lib/string.h:41,
>>                  from lisp.h:29,
>>                  from xfaces.c:226:
>> In function ‘memset’,
>>     inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>>     inlined from ‘realize_gui_face’ at xfaces.c:6214:10,
>>     inlined from ‘realize_face’ at xfaces.c:6124:12:
>> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>>    59 |   return __builtin___memset_chk (__dest, __ch, __len,
>>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>    60 |                                  __glibc_objsize0 (__dest));
>>       |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from termhooks.h:27,
>>                  from frame.h:22,
>>                  from xfaces.c:229:
>> dispextern.h: In function ‘realize_face’:
>> dispextern.h:1730:7: note: subobject ‘id’ declared here
>>  1730 |   int id;
>>       |       ^~
>> In function ‘memset’,
>>     inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>>     inlined from ‘realize_tty_face’ at xfaces.c:6641:10,
>>     inlined from ‘realize_face’ at xfaces.c:6126:12:
>> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>>    59 |   return __builtin___memset_chk (__dest, __ch, __len,
>>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>    60 |                                  __glibc_objsize0 (__dest));
>>       |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
>> dispextern.h: In function ‘realize_face’:
>> dispextern.h:1730:7: note: subobject ‘id’ declared here
>>  1730 |   int id;
>>       |       ^~
>> In function ‘memset’,
>>     inlined from ‘make_realized_face’ at xfaces.c:4581:3,
>>     inlined from ‘realize_face’ at xfaces.c:6130:14:
>> /usr/include/x86_64-linux-gnu/bits/string_fortified.h:59:10: warning: ‘__builtin_memset’ offset [164, 303] from the object at ‘face’ is out of the bounds of referenced subobject ‘id’ with type ‘int’ at offset 160 [-Warray-bounds]
>>    59 |   return __builtin___memset_chk (__dest, __ch, __len,
>>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>    60 |                                  __glibc_objsize0 (__dest));
>>       |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
>> dispextern.h: In function ‘realize_face’:
>> dispextern.h:1730:7: note: subobject ‘id’ declared here
>>  1730 |   int id;
>>       |       ^~
>> ========
>>
>> ATM don't know if it's a real issue or a false positive so I thought was
>> worth mentioning.
>
> Hm, that's this one, right?
>
>   static struct face *
>   make_realized_face (Lisp_Object *attr)
>   {
>     enum { off = offsetof (struct face, id) };
>   #ifdef HAVE_MPS
>     struct face *face = igc_make_face ();
>   #else
>     struct face *face = xmalloc (sizeof *face);
>   #endif
>     memcpy (face->lface, attr, sizeof face->lface);
>     memset (&face->id, 0, sizeof *face - off);
>     face->ascii_face = face;
>
>     return face;
>   }
>
> which we can rewrite, for MPS
>
>   static struct face *
>   make_realized_face (Lisp_Object *attr)
>   {
>   #ifdef HAVE_MPS
>     struct face *face = igc_make_face ();
>     memcpy (face->lface, attr, sizeof face->lface);
>   #else
>     enum { off = offsetof (struct face, id) };
>     struct face *face = xmalloc (sizeof *face);
>     memcpy (face->lface, attr, sizeof face->lface);
>     memset (&face->id, 0, sizeof *face - off);
>   #endif
>     face->ascii_face = face;
>
>     return face;
>   }
>
> because igc returns something zero-initialized anyway. (I'll do that.).

Yep this clean the warning!

> But I wonder - does GCC 12 also complain for the non-MPS case?

It does not, my other tracked branches (master and emacs-30) are now
warning clean here with similar configurations.

With this fix scratch/igc will be warning clean as well 😀

Thanks

  Andrea

Re: scratch/igc warning

[Gerd Möllmann]

Andrea Corallo <acorallo@gnu.org> writes:

>> But I wonder - does GCC 12 also complain for the non-MPS case?
>
> It does not, my other tracked branches (master and emacs-30) are now
> warning clean here with similar configurations.

🤷

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

[Andrea Corallo]

Gerd Möllmann <gerd.moellmann@gmail.com> writes:

> Andrea Corallo <acorallo@gnu.org> writes:
>
>>> But I wonder - does GCC 12 also complain for the non-MPS case?
>>
>> It does not, my other tracked branches (master and emacs-30) are now
>> warning clean here with similar configurations.
>
> 🤷

Cool is clean now!

Changing slightly subject:

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

This fails both with and without nativecomp, not sure this test fail was
already under your radar.

  Andrea

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

[Gerd Möllmann]

Andrea Corallo <acorallo@gnu.org> writes:

> I can bootstrap fine scratch/igc with nativecomp, and make check shows
> here only one fail, 'lread-circle' in src/lread-tests.log.
>
> This fails both with and without nativecomp, not sure this test fail was
> already under your radar.

Thanks. No, I'm not working on the tests.

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

[Helmut Eller]

[-- 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

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

[Gerd Möllmann]

Helmut Eller <eller.helmut@gmail.com> writes:

> 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:

Thanks, and pushed.

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

[Andrea Corallo]

Gerd Möllmann <gerd.moellmann@gmail.com> writes:

> Helmut Eller <eller.helmut@gmail.com> writes:
>
>> 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:
>
> Thanks, and pushed.

Great, I confirm --with-mps --with-native-compilation=yes/no is now
clean on my test.  I'll keep tracking the branch.

  Andrea