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 (iseq_compile_each): remove duplicated line event.

Browse source 
[Bug #10449]
* test/ruby/test_settracefunc.rb: add and fix tests.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-11-27 11:06:51 +00:00
parent 6115f65d7d
commit ea29080489
3 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Nov 27 19:59:49 2014 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile_each): remove duplicated line event.
[Bug #10449]
* test/ruby/test_settracefunc.rb: add and fix tests.
Thu Nov 27 19:04:50 2014 Koichi Sasada <ko1@atdot.net> Thu Nov 27 19:04:50 2014 Koichi Sasada <ko1@atdot.net>
* vm_args.c: fix backtrace location for keyword related exceptions. * vm_args.c: fix backtrace location for keyword related exceptions.

19
compile.c
View file

@ -3268,16 +3268,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
return COMPILE_OK; return COMPILE_OK;
} }
iseq->compile_data->last_line = line = (int)nd_line(node); line = (int)nd_line(node);
if (iseq->compile_data->last_line == line) {
/* ignore */
}
else {
if (node->flags & NODE_FL_NEWLINE) {
iseq->compile_data->last_line = line;
ADD_TRACE(ret, line, RUBY_EVENT_LINE);
saved_last_element = ret->last;
}
}
debug_node_start(node); debug_node_start(node);
type = nd_type(node); type = nd_type(node);
if (node->flags & NODE_FL_NEWLINE) {
ADD_TRACE(ret, line, RUBY_EVENT_LINE);
saved_last_element = ret->last;
}
switch (type) { switch (type) {
case NODE_BLOCK:{ case NODE_BLOCK:{
while (node && nd_type(node) == NODE_BLOCK) { while (node && nd_type(node) == NODE_BLOCK) {

33
test/ruby/test_settracefunc.rb
View file

@ -506,7 +506,6 @@ class TestSetTraceFunc < Test::Unit::TestCase
[:return, 16, "xyzzy", xyzzy.class, :bar, xyzzy, :XYZZY_bar, xyzzy], [:return, 16, "xyzzy", xyzzy.class, :bar, xyzzy, :XYZZY_bar, xyzzy],
[:return, 12, "xyzzy", xyzzy.class, :foo, xyzzy, :XYZZY_foo, xyzzy], [:return, 12, "xyzzy", xyzzy.class, :foo, xyzzy, :XYZZY_foo, xyzzy],
[:line, 20, "xyzzy", TestSetTraceFunc, method, self, :outer, :nothing], [:line, 20, "xyzzy", TestSetTraceFunc, method, self, :outer, :nothing],
[:line, 20, "xyzzy", TestSetTraceFunc, method, self, :outer, :nothing],
[:c_call, 20, "xyzzy", Kernel, :raise, self, :outer, :nothing], [:c_call, 20, "xyzzy", Kernel, :raise, self, :outer, :nothing],
[:c_call, 20, "xyzzy", Exception, :exception, RuntimeError, :outer, :nothing], [:c_call, 20, "xyzzy", Exception, :exception, RuntimeError, :outer, :nothing],
[:c_call, 20, "xyzzy", Exception, :initialize, raised_exc, :outer, :nothing], [:c_call, 20, "xyzzy", Exception, :initialize, raised_exc, :outer, :nothing],
@ -562,14 +561,18 @@ class TestSetTraceFunc < Test::Unit::TestCase
def test_tracepoint def test_tracepoint
events1, answer_events = *trace_by_tracepoint(:line, :class, :end, :call, :return, :c_call, :c_return, :raise) events1, answer_events = *trace_by_tracepoint(:line, :class, :end, :call, :return, :c_call, :c_return, :raise)
mesg = events1.map{|e| ms = [events1, answer_events].map{|evs|
if false evs.map{|e|
p [:event, e[0]] "#{e[0]} - #{e[2]}:#{e[1]} id: #{e[4]}"
p [:line_file, e[1], e[2]] }
p [:id, e[4]] }
mesg = ms[0].zip(ms[1]).map{|a, b|
if a != b
"#{a} <-> #{b}"
end end
"#{e[0]} - #{e[2]}:#{e[1]} id: #{e[4]}" }.compact.join("\n")
}.join("\n")
answer_events.zip(events1){|answer, event| answer_events.zip(events1){|answer, event|
assert_equal answer, event, mesg assert_equal answer, event, mesg
} }
@ -1294,4 +1297,18 @@ class TestSetTraceFunc < Test::Unit::TestCase
} }
end end
end end
def test_no_duplicate_line_events
lines = []
dummy = []
TracePoint.new(:line){|tp|
next unless target_thread?
lines << tp.lineno
}.enable{
dummy << (1) + (2)
dummy << (1) + (2)
}
assert_equal [__LINE__ - 3, __LINE__ - 2], lines, 'Bug #10449'
end
end end