diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-14 07:46:11 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-14 07:46:11 +0000 |
commit | c50afaa1c94c150222d684fbc7fc8b79aa62e0c2 (patch) | |
tree | a18bdaf152fc1b05bec55d70e07a8eaca827ae01 /vm.c | |
parent | 3eb7a6eb0b4466aea4b50043d73e84c85a621f26 (diff) | |
download | ruby-c50afaa1c94c150222d684fbc7fc8b79aa62e0c2.tar.gz |
disable rewind hooks.
* 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
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1637,8 +1637,11 @@ frame_name(const rb_control_frame_t *cfp) #endif 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)) { case VM_FRAME_MAGIC_METHOD: RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); @@ -1829,7 +1832,7 @@ vm_exec(rb_thread_t *th) th->errinfo = Qnil; result = THROW_DATA_VAL(err); 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); goto finish_vme; } @@ -1971,7 +1974,7 @@ vm_exec(rb_thread_t *th) goto vm_loop_start; } 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)) { rb_vm_pop_frame(th); |