Revert "Revert "Rely on conservative stack scanning to find "emacs_value"s""

This reverts commit ee7ad83f20903208404a84b58b7a478b62924570.

There was no consensus on reverting
3eb93c07f7a60ac9ce8a16f10c3afd5a3a31243a, so doing that will have to
wait until the discussion ends.

1 files changed, 3 insertions, 3 deletions

diff --git a/test/data/emacs-module/mod-test.c b/test/data/emacs-module/mod-test.c
index a39e41afee6..47ea159d0e7 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 NULL;
+  return env->intern (env, "nil");
 }
 
 
@@ -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 NULL;
+  return env->intern (env, "nil");
 }
 
 
@@ -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->intern (env, "nil");
+  return env->funcall (env, env->intern (env, "garbage-collect"), 0, NULL);
 }
 
 static void