Enable to take branch coverages for safe method invocations
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
fb38cfb90f
commit
7da13f05fd
19
compile.c
19
compile.c
@ -5581,7 +5581,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
|
|||||||
*/
|
*/
|
||||||
DECL_ANCHOR(recv);
|
DECL_ANCHOR(recv);
|
||||||
DECL_ANCHOR(args);
|
DECL_ANCHOR(args);
|
||||||
LABEL *lskip = 0;
|
LABEL *else_label = 0;
|
||||||
|
LABEL *end_label = 0;
|
||||||
|
VALUE branches = 0;
|
||||||
ID mid = node->nd_mid;
|
ID mid = node->nd_mid;
|
||||||
VALUE argc;
|
VALUE argc;
|
||||||
unsigned int flag = 0;
|
unsigned int flag = 0;
|
||||||
@ -5660,9 +5662,13 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
|
|||||||
if (type == NODE_CALL || type == NODE_OPCALL || type == NODE_QCALL) {
|
if (type == NODE_CALL || type == NODE_OPCALL || type == NODE_QCALL) {
|
||||||
CHECK(COMPILE(recv, "recv", node->nd_recv));
|
CHECK(COMPILE(recv, "recv", node->nd_recv));
|
||||||
if (type == NODE_QCALL) {
|
if (type == NODE_QCALL) {
|
||||||
lskip = NEW_LABEL(line);
|
else_label = NEW_LABEL(line);
|
||||||
|
end_label = NEW_LABEL(line);
|
||||||
|
|
||||||
|
DECL_BRANCH_BASE(branches, nd_line(node), "&.");
|
||||||
ADD_INSN(recv, line, dup);
|
ADD_INSN(recv, line, dup);
|
||||||
ADD_INSNL(recv, line, branchnil, lskip);
|
ADD_INSNL(recv, line, branchnil, else_label);
|
||||||
|
ADD_TRACE_BRANCH_COVERAGE(recv, nd_line(node), "then", branches);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (type == NODE_FCALL || type == NODE_VCALL) {
|
else if (type == NODE_FCALL || type == NODE_VCALL) {
|
||||||
@ -5694,8 +5700,11 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp
|
|||||||
|
|
||||||
ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
|
ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
|
||||||
|
|
||||||
if (lskip) {
|
if (else_label && end_label) {
|
||||||
ADD_LABEL(ret, lskip);
|
ADD_INSNL(ret, line, jump, end_label);
|
||||||
|
ADD_LABEL(ret, else_label);
|
||||||
|
ADD_TRACE_BRANCH_COVERAGE(ret, nd_line(node), "else", branches);
|
||||||
|
ADD_LABEL(ret, end_label);
|
||||||
}
|
}
|
||||||
if (popped) {
|
if (popped) {
|
||||||
ADD_INSN(ret, line, pop);
|
ADD_INSN(ret, line, pop);
|
||||||
|
@ -287,6 +287,27 @@ class TestCoverage < Test::Unit::TestCase
|
|||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_branch_coverage_for_safe_method_invocation
|
||||||
|
Dir.mktmpdir {|tmp|
|
||||||
|
Dir.chdir(tmp) {
|
||||||
|
File.open("test.rb", "w") do |f|
|
||||||
|
f.puts 'a = 10'
|
||||||
|
f.puts 'b = nil'
|
||||||
|
f.puts 'a&.abs'
|
||||||
|
f.puts 'b&.hoo'
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_in_out_err(%w[-W0 -rcoverage], <<-"end;", ["{:branches=>{[:\"&.\", 0, 3]=>{[:then, 1, 3]=>1, [:else, 2, 3]=>0}, [:\"&.\", 3, 4]=>{[:then, 4, 4]=>0, [:else, 5, 4]=>1}}}"], [])
|
||||||
|
ENV["COVERAGE_EXPERIMENTAL_MODE"] = "true"
|
||||||
|
Coverage.start(branches: true)
|
||||||
|
tmp = Dir.pwd
|
||||||
|
require tmp + '/test.rb'
|
||||||
|
p Coverage.result[tmp + "/test.rb"]
|
||||||
|
end;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
def test_method_coverage
|
def test_method_coverage
|
||||||
Dir.mktmpdir {|tmp|
|
Dir.mktmpdir {|tmp|
|
||||||
Dir.chdir(tmp) {
|
Dir.chdir(tmp) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user