Re: MPS: weak hash tables

[Pip Cet <pipcet@protonmail.com>]

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

On Tuesday, July 2nd, 2024 at 09:31, Ihor Radchenko <yantar92@posteo.net> wrote:
> Gerd Möllmann gerd.moellmann@gmail.com writes:
> 
> > > Error: error ("relocation target was not dumped: #s(hash-table test equal weakness value)")
> > > dump-emacs-portable("/home/yantar92/Git/emacs/src/bootstrap-emacs.pdmp")
> > > (if (member tmp-dump-mode '("pdump" "pbootstrap"))
> > 
> > Hm, for me it builds fine. As usual my build starts git clean -xdf, and
> > I built without native-comp. How did you build?
> 
> 
> I did git clean, but I do use native-comp.

Yes, it's native-comp creating a weak-value hash table and dumping it.

Can you try with this fix? Note that properly making that table weak again is still on the TODO list...

Sorry about that, I'd assumed I was building with nativecomp but wasn't.

Pip

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-MPS-native-comp-compilation.patch --]
[-- Type: text/x-patch; name=0001-Fix-MPS-native-comp-compilation.patch, Size: 1090 bytes --]

From b893473925f3f583687b75809f9e219e5a671cdd Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@protonmail.com>
Date: Tue, 2 Jul 2024 09:33:18 +0000
Subject: [PATCH] Fix MPS+native-comp compilation

* src/pdumper.c (decode_emacs_reloc): follow the dump redirection
pointer to a strong hash table.
---
 src/pdumper.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pdumper.c b/src/pdumper.c
index 6ace914820b..dc1621b3cb9 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4015,6 +4015,14 @@ decode_emacs_reloc (struct dump_context *ctx, Lisp_Object lreloc)
           {
 	    eassume (ctx); /* Pacify GCC 9.2.1 -O3 -Wnull-dereference.  */
             eassert (!dump_object_emacs_ptr (target_value));
+#ifdef HAVE_MPS
+	    if (WEAK_HASH_TABLE_P (target_value))
+	      {
+		strengthen_hash_table_for_dump (XWEAK_HASH_TABLE (target_value));
+		target_value = XWEAK_HASH_TABLE (target_value)->dump_replacement;
+	      }
+#endif
+
             reloc.u.dump_offset = dump_recall_object (ctx, target_value);
             if (reloc.u.dump_offset <= 0)
               {
-- 
2.45.2