Commit 093d3e78 authored by Eli Zaretskii's avatar Eli Zaretskii

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

This reverts commit ee7ad83f.

There was no consensus on reverting
3eb93c07, so doing that will have to
wait until the discussion ends.
parent ee7ad83f
Pipeline #1044 failed with stage
in 60 minutes and 1 second
This diff is collapsed.
......@@ -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
......
......@@ -265,8 +265,7 @@ 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)
(garbage-collect)))
(mod-test-invalid-finalizer)))
(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