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

disable rewind hooks.

Browse Source 
* vm.c (hook_before_rewind): skip rewind hooks if err is SystemStackError
  because rewind hooks can cause stack overflow again and again.

* thread.c (ruby_thread_stack_overflow): do not disable all hooks.
  Additionally, clearing ruby_vm_event_flags is not suitable way
  to disable hooks.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-04-14 07:46:11 +00:00
parent 3eb7a6eb0b
commit c50afaa1c9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
thread.c
View File

@ -2169,7 +2169,6 @@ NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
void void
ruby_thread_stack_overflow(rb_thread_t *th) ruby_thread_stack_overflow(rb_thread_t *th)
{ {
ruby_vm_event_flags = 0;
th->raised_flag = 0; th->raised_flag = 0;
#ifdef USE_SIGALTSTACK #ifdef USE_SIGALTSTACK
if (!rb_threadptr_during_gc(th)) { if (!rb_threadptr_during_gc(th)) {

9
vm.c
View File

@ -1637,8 +1637,11 @@ frame_name(const rb_control_frame_t *cfp)
#endif #endif
static void static void
hook_before_rewind(rb_thread_t *th, const rb_control_frame_t *cfp, int will_finish_vm_exec, struct vm_throw_data *err) hook_before_rewind(rb_thread_t *th, const rb_control_frame_t *cfp, int will_finish_vm_exec, int state, struct vm_throw_data *err)
{ {
if (state == TAG_RAISE && RBASIC_CLASS(err) == rb_eSysStackError) {
return;
}
switch (VM_FRAME_TYPE(th->cfp)) { switch (VM_FRAME_TYPE(th->cfp)) {
case VM_FRAME_MAGIC_METHOD: case VM_FRAME_MAGIC_METHOD:
RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0);
@ -1829,7 +1832,7 @@ vm_exec(rb_thread_t *th)
th->errinfo = Qnil; th->errinfo = Qnil;
result = THROW_DATA_VAL(err); result = THROW_DATA_VAL(err);
THROW_DATA_CATCH_FRAME_SET(err, cfp + 1); THROW_DATA_CATCH_FRAME_SET(err, cfp + 1);
hook_before_rewind(th, th->cfp, TRUE, err); hook_before_rewind(th, th->cfp, TRUE, state, err);
rb_vm_pop_frame(th); rb_vm_pop_frame(th);
goto finish_vme; goto finish_vme;
} }
@ -1971,7 +1974,7 @@ vm_exec(rb_thread_t *th)
goto vm_loop_start; goto vm_loop_start;
} }
else { else {
hook_before_rewind(th, th->cfp, FALSE, err); hook_before_rewind(th, th->cfp, FALSE, state, err);
if (VM_FRAME_FINISHED_P(th->cfp)) { if (VM_FRAME_FINISHED_P(th->cfp)) {
rb_vm_pop_frame(th); rb_vm_pop_frame(th);