Commit 3838aeb7 authored by Philipp Stephani's avatar Philipp Stephani
Browse files

Backport: add another test case for module assertions.

This backports commit 9f01ce63 from master.  Since the bug isn’t
present on emacs-27, just backport the new test case.

* test/data/emacs-module/mod-test.c (Fmod_test_globref_invalid_free):
New test module function.
(emacs_module_init): Export it.

* test/src/emacs-module-tests.el
(module--test-assertions--globref-invalid-free): New unit test.
parent bde5f5f8
Pipeline #6136 passed with stage
in 60 minutes and 21 seconds
......@@ -191,7 +191,19 @@ Fmod_test_globref_free (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
return env->intern (env, "ok");
/* Treat a local reference as global and free it. Module assertions
should detect this case even if a global reference representing the
same object also exists. */
static emacs_value
Fmod_test_globref_invalid_free (emacs_env *env, ptrdiff_t nargs,
emacs_value *args, void *data)
emacs_value local = env->make_integer (env, 9876);
env->make_global_ref (env, local);
env->free_global_ref (env, local); /* Not allowed. */
return env->intern (env, "nil");
/* Return a copy of the argument string where every 'a' is replaced
with 'b'. */
......@@ -569,6 +581,8 @@ emacs_module_init (struct emacs_runtime *ert)
1, 1, NULL, NULL);
DEFUN ("mod-test-globref-make", Fmod_test_globref_make, 0, 0, NULL, NULL);
DEFUN ("mod-test-globref-free", Fmod_test_globref_free, 4, 4, NULL, NULL);
DEFUN ("mod-test-globref-invalid-free", Fmod_test_globref_invalid_free, 0, 0,
DEFUN ("mod-test-string-a-to-b", Fmod_test_string_a_to_b, 1, 1, NULL, NULL);
DEFUN ("mod-test-userptr-make", Fmod_test_userptr_make, 1, 1, NULL, NULL);
DEFUN ("mod-test-userptr-get", Fmod_test_userptr_get, 1, 1, NULL, NULL);
......@@ -299,6 +299,17 @@ during garbage collection."
(ert-deftest module--test-assertions--globref-invalid-free ()
"Check that -module-assertions detects invalid freeing of a
local reference."
(skip-unless (or (file-executable-p mod-test-emacs)
(and (eq system-type 'windows-nt)
(file-executable-p (concat mod-test-emacs ".exe")))))
(rx "Global value was not found in list of " (+ digit) " globals")
(ert-deftest module/describe-function-1 ()
"Check that Bug#30163 is fixed."
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment