      cfp = vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC,
  			recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1);
      /* Store actual argument count. Note that cfunc.argc contains the
-@@ -400,6 +398,8 @@
+@@ -404,6 +398,8 @@
      */
      me->def->body.cfunc.actual_argc = num;
      cfp->me = me;

  *     thr.set_trace_func(nil)     -> nil
  *
  *  Establishes _proc_ on _thr_ as the handler for tracing, or
@@ -3990,16 +4028,24 @@
  */
 
 static VALUE

===================================================================
--- vm_insnhelper.c	(revision 28647)
+++ vm_insnhelper.c	(working copy)
@@ -395,8 +391,6 @@
     const rb_method_definition_t *def = me->def;
     rb_control_frame_t *cfp;
 
