procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Revert "Remove check_comp_unit_relocs"

Browse source 
This reverts commit 81fc23b5d6 as the
check is still useful but needs to be updated for the new reloc layout.

* src/comp.c (check_comp_unit_relocs): Re-add.
(load_comp_unit): Make use of.
This commit is contained in:
Andrea Corallo 2024-12-18 21:27:14 +01:00
parent 81fc23b5d6
commit 4e11f9c96d
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/comp.c
View file

@ -5160,6 +5160,32 @@ load_static_obj (struct Lisp_Native_Comp_Unit *comp_u, const char *name)
}
/* Return false when something is wrong or true otherwise. */
static bool
check_comp_unit_relocs (struct Lisp_Native_Comp_Unit *comp_u)
{
dynlib_handle_ptr handle = comp_u->handle;
Lisp_Object *data_relocs = dynlib_sym (handle, DATA_RELOC_SYM);
EMACS_INT d_vec_len = XFIXNUM (Flength (comp_u->data_vec));
for (ptrdiff_t i = 0; i < d_vec_len; i++)
{
Lisp_Object x = data_relocs[i];
if (EQ (x, Qlambda_fixup))
return false;
else if (NATIVE_COMP_FUNCTIONP (x))
{
if (NILP (Fgethash (x, comp_u->lambda_gc_guard_h, Qnil)))
return false;
}
else if (!EQ (x, AREF (comp_u->data_vec, i)))
return false;
}
return true;
}
static void
unset_cu_load_ongoing (Lisp_Object comp_u)
{
@ -5289,6 +5315,7 @@ load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u, bool loading_dump,
/* Make sure data_ephemeral_vec still exists after top_level_run has run.
Guard against sibling call optimization (or any other). */
data_ephemeral_vec = data_ephemeral_vec;
eassert (check_comp_unit_relocs (comp_u));
}
if (!recursive_load)