ko1	2017-04-14 16:46:11 +0900 (Fri, 14 Apr 2017)

  New Revision: 58349

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58349

  Log:
    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.

  Modified files:
    trunk/thread.c
    trunk/vm.c
Index: thread.c
===================================================================
--- thread.c	(revision 58348)
+++ thread.c	(revision 58349)
@@ -2169,7 +2169,6 @@ NORETURN(void ruby_thread_stack_overflow https://github.com/ruby/ruby/blob/trunk/thread.c#L2169
 void
 ruby_thread_stack_overflow(rb_thread_t *th)
 {
-    ruby_vm_event_flags = 0;
     th->raised_flag = 0;
 #ifdef USE_SIGALTSTACK
     if (!rb_threadptr_during_gc(th)) {
Index: vm.c
===================================================================
--- vm.c	(revision 58348)
+++ vm.c	(revision 58349)
@@ -1637,8 +1637,11 @@ frame_name(const rb_control_frame_t *cfp https://github.com/ruby/ruby/blob/trunk/vm.c#L1637
 #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) https://github.com/ruby/ruby/blob/trunk/vm.c#L1832
 			    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) https://github.com/ruby/ruby/blob/trunk/vm.c#L1974
 	    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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/