Fix load_comp_unit for non zero speeds

'dlopen' returns the same handle when trying to load two times
the same shared.

Touching 'd_reloc' etc leads to fails in case a frame with a reference
to it in a register is active. (comp-speed >= 0)

1 files changed, 19 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index faa8e703937..431238b13e6 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -517,6 +517,14 @@ Lisp_Object const *staticvec[NSTATICS]
 
 int staticidx;
 
+/* Lisp of freed native compilation unit handles.
+
+   Because during GC Vcomp_loaded_handles can't be used (hash table) temporary
+   annotate here and update Vcomp_loaded_handles when finished.
+*/
+
+static Lisp_Object freed_cu_handles[NATIVE_COMP_FLAG];
+
 static void *pure_alloc (size_t, int);
 
 /* Return PTR rounded up to the next multiple of ALIGNMENT.  */
@@ -3030,6 +3038,10 @@ cleanup_vector (struct Lisp_Vector *vector)
         PSEUDOVEC_STRUCT (vector, Lisp_Native_Comp_Unit);
       eassert (cu->handle);
       dynlib_close (cu->handle);
+      /* We'll update Vcomp_loaded_handles when finished.  */
+      freed_cu_handles[0] =
+        Fcons (make_mint_ptr (cu->handle), freed_cu_handles[0]);
+      set_cons_marked (XCONS (freed_cu_handles[0]));
     }
 }
 
@@ -5937,6 +5949,9 @@ garbage_collect (void)
   if (garbage_collection_messages)
     message1_nolog ("Garbage collecting...");
 
+  if (NATIVE_COMP_FLAG)
+    freed_cu_handles[0] = Qnil;
+
   block_input ();
 
   shrink_regexp_cache ();
@@ -6001,6 +6016,10 @@ garbage_collect (void)
 
   gc_in_progress = 0;
 
+  if (NATIVE_COMP_FLAG)
+    FOR_EACH_TAIL (freed_cu_handles[0])
+      Fputhash (XCAR (freed_cu_handles[0]), Qnil, Vcomp_loaded_handles);
+
   unblock_input ();
 
   consing_until_gc = gc_threshold