1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove SAVE_ROOT_JMPBUF as it no longer has any effect. (#10066)

Browse Source
This commit is contained in:
Samuel Williams 2024-02-22 22:35:54 +13:00 committed by GitHub
parent b7f5c80036
commit 6a0b05f413
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eval.c
View File

@ -115,7 +115,7 @@ ruby_options(int argc, char **argv)
EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
iseq = ruby_process_options(argc, argv);
}
else {
rb_ec_clear_current_thread_trace_func(ec);
@ -197,7 +197,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(ec); });
RUBY_VM_CHECK_INTS(ec);
step_0: step++;
save_error = ec->errinfo;
@ -205,7 +205,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
/* exits with failure but silently when an exception raised
* here */
SAVE_ROOT_JMPBUF(th, rb_ec_teardown(ec));
rb_ec_teardown(ec);
step_1: step++;
VALUE err = ec->errinfo;
@ -223,7 +223,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
mode1 = exiting_split(err, (mode0 & EXITING_WITH_STATUS) ? NULL : &sysex, &signaled);
if (mode1 & EXITING_WITH_MESSAGE) {
buf = rb_str_new(NULL, 0);
SAVE_ROOT_JMPBUF(th, rb_ec_error_print_detailed(ec, err, buf, Qundef));
rb_ec_error_print_detailed(ec, err, buf, Qundef);
message = buf;
}
}
@ -232,7 +232,7 @@ rb_ec_cleanup(rb_execution_context_t *ec, enum ruby_tag_type ex)
/* protect from Thread#raise */
th->status = THREAD_KILLED;
SAVE_ROOT_JMPBUF(th, rb_ractor_terminate_all());
rb_ractor_terminate_all();
step_3: step++;
if (!NIL_P(buf = message)) {
@ -280,9 +280,7 @@ rb_ec_exec_node(rb_execution_context_t *ec, void *n)
EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
rb_thread_t *const th = rb_ec_thread_ptr(ec);
SAVE_ROOT_JMPBUF(th, {
rb_iseq_eval_main(iseq);
});
rb_iseq_eval_main(iseq);
}
EC_POP_TAG();
return state;
@ -974,7 +972,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
EC_PUSH_TAG(ec);
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
SAVE_ROOT_JMPBUF(rb_ec_thread_ptr(ec), result = (*proc) (data));
result = (*proc)(data);
}
else {
rb_vm_rewind_cfp(ec, cfp);

8
eval_intern.h
View File

@ -95,14 +95,6 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
#include <sys/stat.h>
#define SAVE_ROOT_JMPBUF(th, stmt) do \
if (true) { \
stmt; \
} \
else if (th) { /* suppress unused-variable warning */ \
} while (0)
#define EC_PUSH_TAG(ec) do { \
rb_execution_context_t * const _ec = (ec); \
struct rb_vm_tag _tag; \

2
thread.c
View File

@ -664,7 +664,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_THREAD_BEGIN, th->self, 0, 0, 0, Qundef);
SAVE_ROOT_JMPBUF(th, result = thread_do_start(th));
result = thread_do_start(th);
}
if (!fiber_scheduler_closed) {