diff options
author | yui-knk <yui-knk@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-23 00:17:35 +0000 |
---|---|---|
committer | yui-knk <yui-knk@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-23 00:17:35 +0000 |
commit | 7da13f05fdfa25c75e9ee02428d7b2ea175cd09d (patch) | |
tree | bfc73ac9ec008fd7e47362cdb3399a465f7f25c7 | |
parent | fb38cfb90fcd467e398cbfc13aa99cf38c569311 (diff) | |
download | ruby-7da13f05fdfa25c75e9ee02428d7b2ea175cd09d.tar.gz |
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
-rw-r--r-- | compile.c | 19 | ||||
-rw-r--r-- | test/coverage/test_coverage.rb | 21 |
2 files changed, 35 insertions, 5 deletions
@@ -5581,7 +5581,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp */ DECL_ANCHOR(recv); DECL_ANCHOR(args); - LABEL *lskip = 0; + LABEL *else_label = 0; + LABEL *end_label = 0; + VALUE branches = 0; ID mid = node->nd_mid; VALUE argc; 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) { CHECK(COMPILE(recv, "recv", node->nd_recv)); 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_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) { @@ -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); - if (lskip) { - ADD_LABEL(ret, lskip); + if (else_label && end_label) { + 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) { ADD_INSN(ret, line, pop); diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb index 41a7e93402..b9a8dc96ce 100644 --- a/test/coverage/test_coverage.rb +++ b/test/coverage/test_coverage.rb @@ -287,6 +287,27 @@ class TestCoverage < Test::Unit::TestCase } 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 Dir.mktmpdir {|tmp| Dir.chdir(tmp) { |