diff options
| author | Takashi Kokubun <[email protected]> | 2021-01-11 07:40:37 +0000 |
|---|---|---|
| committer | Takashi Kokubun <[email protected]> | 2021-01-11 07:40:38 +0000 |
| commit | 2a1c68c91efeba93c413d0736bc513179d784c50 (patch) | |
| tree | a21c9795571cbf8ef554a748c5e8655d40cd4fd2 | |
| parent | 5e00eeb4d445fe28ec16b7c28cc9c02c5fc764db (diff) | |
Avoid re-entering opt_invokebuiltin_delegate_leave
on interruption.
The cancellation code was originally written for leave insn, but re-entering
opt_invokebuiltin_delegate_leave insn on a cancellation is not safe, because
a builtin function is executed twice.
| -rw-r--r-- | tool/ruby_vm/views/mjit_compile.inc.erb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tool/ruby_vm/views/mjit_compile.inc.erb b/tool/ruby_vm/views/mjit_compile.inc.erb index 937cb4a6d0..5820f81770 100644 --- a/tool/ruby_vm/views/mjit_compile.inc.erb +++ b/tool/ruby_vm/views/mjit_compile.inc.erb @@ -84,8 +84,7 @@ switch (insn) { fprintf(f, " if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(ec))) {\n"); fprintf(f, " reg_cfp->sp = vm_base_ptr(reg_cfp) + %d;\n", b->stack_size); fprintf(f, " reg_cfp->pc = original_body_iseq + %d;\n", pos); - fprintf(f, " RB_DEBUG_COUNTER_INC(mjit_cancel_leave);\n"); - fprintf(f, " goto cancel;\n"); + fprintf(f, " rb_threadptr_execute_interrupts(rb_ec_thread_ptr(ec), 0);\n"); fprintf(f, " }\n"); fprintf(f, " ec->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(reg_cfp);\n"); // vm_pop_frame } |