From ee7ad83f20903208404a84b58b7a478b62924570 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Fri, 21 Sep 2018 19:28:08 +0200 Subject: Revert "Rely on conservative stack scanning to find "emacs_value"s" This reverts commit 3eb93c07f7a60ac9ce8a16f10c3afd5a3a31243a. There was no consensus for that commit, see https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00150.html. Also, reverting this commit should fix Bug#31238. --- test/data/emacs-module/mod-test.c | 6 +++--- test/src/emacs-module-tests.el | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/data/emacs-module/mod-test.c b/test/data/emacs-module/mod-test.c index 47ea159d0e7..a39e41afee6 100644 --- a/test/data/emacs-module/mod-test.c +++ b/test/data/emacs-module/mod-test.c @@ -94,7 +94,7 @@ Fmod_test_signal (emacs_env *env, ptrdiff_t nargs, emacs_value args[], assert (env->non_local_exit_check (env) == emacs_funcall_exit_return); env->non_local_exit_signal (env, env->intern (env, "error"), env->make_integer (env, 56)); - return env->intern (env, "nil"); + return NULL; } @@ -106,7 +106,7 @@ Fmod_test_throw (emacs_env *env, ptrdiff_t nargs, emacs_value args[], assert (env->non_local_exit_check (env) == emacs_funcall_exit_return); env->non_local_exit_throw (env, env->intern (env, "tag"), env->make_integer (env, 65)); - return env->intern (env, "nil"); + return NULL; } @@ -304,7 +304,7 @@ Fmod_test_invalid_finalizer (emacs_env *env, ptrdiff_t nargs, emacs_value *args, { current_env = env; env->make_user_ptr (env, invalid_finalizer, NULL); - return env->funcall (env, env->intern (env, "garbage-collect"), 0, NULL); + return env->intern (env, "nil"); } static void diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el index e30980b5993..35aaaa64b65 100644 --- a/test/src/emacs-module-tests.el +++ b/test/src/emacs-module-tests.el @@ -265,7 +265,8 @@ during garbage collection." (skip-unless (file-executable-p mod-test-emacs)) (module--test-assertion (rx "Module function called during garbage collection\n") - (mod-test-invalid-finalizer))) + (mod-test-invalid-finalizer) + (garbage-collect))) (ert-deftest module/describe-function-1 () "Check that Bug#30163 is fixed." -- cgit v1.2.1