ruby-dev

Issue #9959 has been updated by Koichi Sasada.

Status changed from Open to Closed
% Done changed from 0 to 100

Applied in changeset r46464.

----------
* vm.c (invoke_block_from_c): move call/return event timing for
  bmethod. It can invoke inconsistent call event if this call raises
  argument error.
  [Bug #9959]
* vm_insnhelper.c (vm_call_bmethod_body): ditto.
* test/ruby/test_settracefunc.rb: add a test.

----------------------------------------
Bug #9959: TracePoint can invoke inconsistent call event with bmethod
https://bugs.ruby-lang.org/issues/9959#change-47288

* Author: Koichi Sasada
* Status: Closed
* Priority: Normal
* Assignee: Koichi Sasada
* Category: core
* Target version: current: 2.2.0
* ruby -v: 2.2
* Backport: 2.0.0: REQUIRED, 2.1: REQUIRED
----------------------------------------
define_method =E3=81=A7=E5=AE=9A=E7=BE=A9=E3=81=97=E3=81=9F=E3=83=A1=E3=82=
=BD=E3=83=83=E3=83=89=EF=BC=88=E4=BB=A5=E9=99=8D=E3=80=81bmethod=EF=BC=89=
=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D=E3=80=81=E5=
=BC=95=E6=95=B0=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E3=81=82=E3=81=
=A3=E3=81=9F=E3=81=A8=E3=81=8D=E3=80=81call =E3=82=A4=E3=83=99=E3=83=B3=E3=
=83=88=E3=81=AE=E3=81=BF=E7=99=BA=E7=94=9F=E3=81=97=E3=80=81return =E3=82=
=A4=E3=83=99=E3=83=B3=E3=83=88=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97=E3=81=AA=
=E3=81=84=E3=80=81=E3=81=A8=E3=81=84=E3=81=86=E5=95=8F=E9=A1=8C=E3=81=8C=E3=
=81=82=E3=82=8A=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82

```ruby
  define_method(:method_test_argument_error_on_bmethod){|correct_key: 1|}

  def test_argument_error_on_bmethod
    events =3D []
    curr_thread =3D Thread.current
    TracePoint.new(:call, :return){|tp|
      next if curr_thread !=3D Thread.current
      events << [tp.event, tp.method_id]
    }.enable do
      begin
        method_test_argument_error_on_bmethod(wrong_key: 2)
      rescue =3D> e
        # ignore
      end
    end

    assert_equal [], events # should be empty.
  end
```

=E4=BB=8A=E3=81=A0=E3=81=A8=E3=80=81=E6=AC=A1=E3=81=AE=E3=82=88=E3=81=86=E3=
=81=AB=E3=81=AA=E3=82=8A=E3=81=BE=E3=81=99=E3=80=82

```
TestSetTraceFunc#test_argument_error_on_bmethod [test_settracefunc.rb:1258]:
<[]> expected but was
<[[:call, :method_test_argument_error_on_bmethod]]>.
```

=E3=81=93=E3=82=8C=E3=81=AF=E3=80=81Proc =E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=
=99=E3=82=8B=E5=89=8D=E3=81=AB TracePoint(call) =E3=82=92=E7=99=BA=E7=94=9F=
=E3=81=99=E3=82=8B=E3=81=8C=E3=80=81
=E4=BE=8B=E5=A4=96=E3=81=A7=E6=88=BB=E3=82=8D=E3=81=86=E3=81=A8=E3=81=97=E3=
=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=80=81=E3=81=BE=E3=81=A0 Proc =E3=81=8C=
=E8=B5=B7=E5=8B=95=E3=81=97=E3=81=A6=E3=81=8A=E3=82=89=E3=81=9A=E3=80=81=E3=
=83=95=E3=83=AC=E3=83=BC=E3=83=A0=E3=81=AB=E6=83=85=E5=A0=B1=E3=81=8C=E3=81=
=AA=E3=81=84=E3=81=9F=E3=82=81=E3=80=81
return =E3=82=A4=E3=83=99=E3=83=B3=E3=83=88=E3=81=8C=E7=99=BA=E7=94=9F=E3=
=81=97=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81=E3=80=81=E8=B5=B7=E3=81=93=E3=82=
=8A=E3=81=BE=E3=81=99=E3=80=82

=E3=81=93=E3=82=8C=E3=82=92=E8=A7=A3=E6=B1=BA=E3=81=99=E3=82=8B=E3=81=9F=E3=
=82=81=E3=81=AB=E3=80=81bmethod =E7=94=A8=E3=81=AE call/return =E3=82=A4=E3=
=83=99=E3=83=B3=E3=83=88=E3=82=92=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E5=A0=
=B4=E6=89=80=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=
=E3=80=82

```diff
Index: vm.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- vm.c	(revision 46463)
+++ vm.c	(working copy)
@@ -715,15 +715,17 @@
 		    const rb_block_t *blockptr, const NODE *cref,
 		    VALUE defined_class, int splattable)
 {
-    if (SPECIAL_CONST_P(block->iseq))
+    if (SPECIAL_CONST_P(block->iseq)) {
 	return Qnil;
+    }
     else if (BUILTIN_TYPE(block->iseq) !=3D T_NODE) {
+	VALUE ret;
 	const rb_iseq_t *iseq =3D block->iseq;
 	const rb_control_frame_t *cfp;
 	int i, opt_pc, arg_size =3D iseq->arg_size;
-	int type =3D block_proc_is_lambda(block->proc) ?
-	  VM_FRAME_MAGIC_LAMBDA : VM_FRAME_MAGIC_BLOCK;
-
+	int type =3D block_proc_is_lambda(block->proc) ? VM_FRAME_MAGIC_LAMBDA : =
VM_FRAME_MAGIC_BLOCK;
+	const rb_method_entry_t *me =3D th->passed_bmethod_me;
+	th->passed_bmethod_me =3D 0;
 	cfp =3D th->cfp;
=20
 	for (i=3D0; i<argc; i++) {
@@ -733,7 +735,7 @@
 	opt_pc =3D vm_yield_setup_args(th, iseq, argc, cfp->sp, blockptr,
 				     (type =3D=3D VM_FRAME_MAGIC_LAMBDA) ? splattable+1 : 0);
=20
-	if (th->passed_bmethod_me !=3D 0) {
+	if (me !=3D 0) {
 	    /* bmethod */
 	    vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_B=
METHOD,
 			  self, defined_class,
@@ -740,8 +742,10 @@
 			  VM_ENVVAL_PREV_EP_PTR(block->ep),
 			  iseq->iseq_encoded + opt_pc,
 			  cfp->sp + arg_size, iseq->local_size - arg_size,
-			  th->passed_bmethod_me, iseq->stack_max);
-	    th->passed_bmethod_me =3D 0;
+			  me, iseq->stack_max);
+
+	    RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->klass, me->called_id);
+	    EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->called_id, me->klass, =
Qnil);
 	}
 	else {
 	    vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH,
@@ -756,7 +760,15 @@
 	    th->cfp->ep[-1] =3D (VALUE)cref;
 	}
=20
-	return vm_exec(th);
+	ret =3D vm_exec(th);
+
+	if (me) {
+	    /* bmethod */
+	    EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->called_id, me->klass=
, ret);
+	    RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->klass, me->called_id);
+	}
+
+	return ret;
     }
     else {
 	return vm_yield_with_cfunc(th, block, self, argc, argv, blockptr);
Index: vm_insnhelper.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- vm_insnhelper.c	(revision 46462)
+++ vm_insnhelper.c	(working copy)
@@ -1615,17 +1615,11 @@
     rb_proc_t *proc;
     VALUE val;
=20
-    RUBY_DTRACE_METHOD_ENTRY_HOOK(th, ci->me->klass, ci->me->called_id);
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, ci->recv, ci->me->called_id, ci->=
me->klass, Qnil);
-
     /* control block frame */
     th->passed_bmethod_me =3D ci->me;
     GetProcPtr(ci->me->def->body.proc, proc);
     val =3D vm_invoke_proc(th, proc, ci->recv, ci->defined_class, ci->argc=
, argv, ci->blockptr);
=20
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, ci->recv, ci->me->called_id, ci=
->me->klass, val);
-    RUBY_DTRACE_METHOD_RETURN_HOOK(th, ci->me->klass, ci->me->called_id);
-
     return val;
 }
=20
```

=E3=81=93=E3=82=8C=E3=82=82=E3=80=812.1, 2.0 =E3=81=A7=E5=86=8D=E7=8F=BE=E3=
=81=97=E3=81=BE=E3=81=99=E3=80=82




--=20
https://bugs.ruby-lang.org/