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_set_sequence): fix branch coverage table

Browse source 
Not only TRACE_ELEMENT but also INSN_ELEMENT may have events.
The old pc2branchindex was created using only events of TRACE_ELEMENTs.
This change uses events of INSN_ELEMENTs too for pc2branchindex table.

[Bug #15476]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2019-01-01 03:03:17 +00:00
parent 99d3631847
commit 9613af6f34
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compile.c
View file

@ -2061,6 +2061,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
/* update sp */ /* update sp */
sp = calc_sp_depth(sp, iobj); sp = calc_sp_depth(sp, iobj);
insn_num++; insn_num++;
events = iobj->insn_info.events |= events;
if (ISEQ_COVERAGE(iseq)) { if (ISEQ_COVERAGE(iseq)) {
if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) && if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) &&
!(rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES)) { !(rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES)) {
@ -2077,7 +2078,6 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
} }
} }
code_index += insn_data_length(iobj); code_index += insn_data_length(iobj);
iobj->insn_info.events |= events;
events = 0; events = 0;
data = 0; data = 0;
break; break;

14
test/coverage/test_coverage.rb
View file

@ -167,6 +167,20 @@ class TestCoverage < Test::Unit::TestCase
end; end;
end end
def test_coverage_optimized_branch
result = {
:branches => {
[:"&.", 0, 1, 0, 1, 8] => {
[:then, 1, 1, 0, 1, 8] => 1,
[:else, 2, 1, 0, 1, 8] => 0,
},
},
}
assert_coverage(<<~"end;", { branches: true }, result) # Bug #15476
nil&.foo
end;
end
def assert_coverage(code, opt, stdout) def assert_coverage(code, opt, stdout)
stdout = [stdout] unless stdout.is_a?(Array) stdout = [stdout] unless stdout.is_a?(Array)
stdout = stdout.map {|s| s.to_s } stdout = stdout.map {|s| s.to_s }