naruse	2017-03-12 01:24:17 +0900 (Sun, 12 Mar 2017)

  New Revision: 57853

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

  Log:
    merge revision(s) 57293: [Backport #13107]
    
    vm_insnhelper.c: block argument at tailcall
    
    * vm_insnhelper.c (vm_call_iseq_setup_tailcall): check interrupts
      after set up the new frame, not the passed block to be clobbered
      by invoked finalizers and so on.  [ruby-core:78981] [Bug #13107]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/version.h
    branches/ruby_2_4/vm_insnhelper.c
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57852)
+++ ruby_2_4/version.h	(revision 57853)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 18
+#define RUBY_PATCHLEVEL 19
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/vm_insnhelper.c
===================================================================
--- ruby_2_4/vm_insnhelper.c	(revision 57852)
+++ ruby_2_4/vm_insnhelper.c	(revision 57853)
@@ -1538,8 +1538,6 @@ vm_call_iseq_setup_tailcall(rb_thread_t https://github.com/ruby/ruby/blob/trunk/ruby_2_4/vm_insnhelper.c#L1538
     vm_pop_frame(th, cfp, cfp->ep);
     cfp = th->cfp;
 
-    RUBY_VM_CHECK_INTS(th);
-
     sp_orig = sp = cfp->sp;
 
     /* push self */
@@ -1558,6 +1556,8 @@ vm_call_iseq_setup_tailcall(rb_thread_t https://github.com/ruby/ruby/blob/trunk/ruby_2_4/vm_insnhelper.c#L1556
 		  iseq->body->stack_max);
 
     cfp->sp = sp_orig;
+    RUBY_VM_CHECK_INTS(th);
+
     return Qundef;
 }
 

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57293


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