kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* compile.c (rb_iseq_compile_node): fix location of a `trace'

Browse source 
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
This commit is contained in:
ko1 2013-06-14 09:54:58 +00:00
parent 87a120fbdc
commit f41b284fab
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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,

2
compile.c
View file

@ -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);

13
test/ruby/test_settracefunc.rb
View file

@ -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