diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-14 09:54:58 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-14 09:54:58 +0000 |
commit | f41b284fab83ad067eead551e7e9b3d67b2a1e8e (patch) | |
tree | cc95bc12236e1227dad1e3dd665271941f8d670d | |
parent | 87a120fbdc25544135e8d625e8dc11950b7245a3 (diff) | |
download | ruby-f41b284fab83ad067eead551e7e9b3d67b2a1e8e.tar.gz |
* compile.c (rb_iseq_compile_node): fix location of a `trace'
instruction (b_return event).
[ruby-core:55305] [ruby-trunk - Bug #8489]
(need a backport to 2.0.0?)
* test/ruby/test_settracefunc.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | compile.c | 2 | ||||
-rw-r--r-- | test/ruby/test_settracefunc.rb | 13 |
3 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Fri Jun 14 18:52:51 2013 Koichi Sasada <ko1@atdot.net> + + * compile.c (rb_iseq_compile_node): fix location of a `trace' + instruction (b_return event). + [ruby-core:55305] [ruby-trunk - Bug #8489] + (need a backport to 2.0.0?) + + * test/ruby/test_settracefunc.rb: add a test. + Fri Jun 14 18:18:07 2013 Koichi Sasada <ko1@atdot.net> * class.c, include/ruby/ruby.h: add write barriers for T_CLASS, @@ -482,8 +482,8 @@ rb_iseq_compile_node(VALUE self, NODE *node) ADD_LABEL(ret, start); ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL); COMPILE(ret, "block body", node->nd_body); - ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN); ADD_LABEL(ret, end); + ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN); /* wide range catch handler must put at last */ ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start); diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index ab1a37f8eb..4319c8fc75 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -953,4 +953,17 @@ class TestSetTraceFunc < Test::Unit::TestCase set_trace_func(nil) end end + + def test_tracepoint_b_return_with_next + n = 0 + TracePoint.new(:b_return){ + n += 1 + }.enable{ + 3.times{ + next + } # 3 times b_retun + } # 1 time b_return + + assert_equal 4, n + end end |