diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-24 04:12:30 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-24 04:12:30 +0000 |
commit | 9d803dfd5f1a57a6d07c27b0d95917165ba259dc (patch) | |
tree | 6e72b20923d4d47274258935b07da4afcb6ea790 /vm_trace.c | |
parent | 76cffcdbf2554afbaf8018b8a6c5993bf09577c1 (diff) |
* vm_trace.c (rb_tracepoint_attr_raised_exception): should not check
value before event checking.
* vm_trace.c (rb_tracepoint_attr_return_value): ditto.
* test/ruby/test_settracefunc.rb: add tests for TracePoint#return_value
and TracePoint#raised_exception.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
-rw-r--r-- | vm_trace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vm_trace.c b/vm_trace.c index a2ede6498b..23f412e541 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -750,15 +750,15 @@ rb_tracepoint_attr_return_value(VALUE tpval) rb_tp_t *tp = tpptr(tpval); tp_attr_check_active(tp); - if (tp->trace_arg->data == Qundef) { - rb_bug("tp_attr_return_value_m: unreachable"); - } if (tp->trace_arg->event & (RUBY_EVENT_RETURN | RUBY_EVENT_C_RETURN)) { /* ok */ } else { rb_raise(rb_eRuntimeError, "not supported by this event"); } + if (tp->trace_arg->data == Qundef) { + rb_bug("tp_attr_return_value_m: unreachable"); + } return tp->trace_arg->data; } @@ -768,15 +768,15 @@ rb_tracepoint_attr_raised_exception(VALUE tpval) rb_tp_t *tp = tpptr(tpval); tp_attr_check_active(tp); - if (tp->trace_arg->data == Qundef) { - rb_bug("tp_attr_raised_exception_m: unreachable"); - } if (tp->trace_arg->event & (RUBY_EVENT_RAISE)) { /* ok */ } else { rb_raise(rb_eRuntimeError, "not supported by this event"); } + if (tp->trace_arg->data == Qundef) { + rb_bug("tp_attr_raised_exception_m: unreachable"); + } return tp->trace_arg->data; } |