summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-14 06:34:02 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-14 06:34:02 +0000
commitaed655c0969baeb48f1f683ba4426ec7b7f466bb (patch)
tree937c7ce31662e9851188f3fb9088e8b045d72500
parentd3aa6514b455835220212298a4b189db28300c19 (diff)
merge revision(s) 66670,66676: [Backport #15476]
compile.c: support branch coverage for `a&.foo = 1` [Bug #15476] compile.c (iseq_set_sequence): fix branch coverage table 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/branches/ruby_2_6@66813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--compile.c20
-rw-r--r--test/coverage/test_coverage.rb31
-rw-r--r--version.h2
3 files changed, 42 insertions, 11 deletions
diff --git a/compile.c b/compile.c
index 0bca488614..a23e7867aa 100644
--- a/compile.c
+++ b/compile.c
@@ -2061,6 +2061,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
/* update sp */
sp = calc_sp_depth(sp, iobj);
insn_num++;
+ events = iobj->insn_info.events |= events;
if (ISEQ_COVERAGE(iseq)) {
if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) &&
!(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);
- iobj->insn_info.events |= events;
events = 0;
data = 0;
break;
@@ -7459,8 +7459,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
DECL_ANCHOR(args);
unsigned int flag = 0;
ID mid = node->nd_mid;
- LABEL *lskip = 0;
+ LABEL *else_label = 0;
+ LABEL *end_label = 0;
VALUE argc;
+ VALUE branches = 0;
/* optimization shortcut
* obj["literal"] = value -> opt_aset_with(obj, "literal", value)
@@ -7500,8 +7502,11 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
/* safe nav attr */
mid = rb_id_attrset(mid);
ADD_INSN(recv, line, dup);
- lskip = NEW_LABEL(line);
- ADD_INSNL(recv, line, branchnil, lskip);
+ else_label = NEW_LABEL(line);
+ end_label = NEW_LABEL(line);
+ DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "&.");
+ ADD_INSNL(recv, line, branchnil, else_label);
+ ADD_TRACE_BRANCH_COVERAGE(recv, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "then", branches);
}
if (!popped) {
ADD_INSN(ret, line, putnil);
@@ -7533,7 +7538,12 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
ADD_SEQ(ret, args);
}
ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag));
- 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_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
+ ADD_LABEL(ret, end_label);
+ }
ADD_INSN(ret, line, pop);
break;
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
index d2a2d018a9..6a58706440 100644
--- a/test/coverage/test_coverage.rb
+++ b/test/coverage/test_coverage.rb
@@ -167,6 +167,20 @@ class TestCoverage < Test::Unit::TestCase
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)
stdout = [stdout] unless stdout.is_a?(Array)
stdout = stdout.map {|s| s.to_s }
@@ -348,15 +362,22 @@ class TestCoverage < Test::Unit::TestCase
def test_branch_coverage_for_safe_method_invocation
result = {
:branches=>{
- [:"&.", 0, 3, 0, 3, 6] => {[:then, 1, 3, 0, 3, 6]=>1, [:else, 2, 3, 0, 3, 6]=>0},
- [:"&.", 3, 4, 0, 4, 6] => {[:then, 4, 4, 0, 4, 6]=>0, [:else, 5, 4, 0, 4, 6]=>1},
+ [:"&.", 0, 6, 0, 6, 6] => {[:then, 1, 6, 0, 6, 6]=>1, [:else, 2, 6, 0, 6, 6]=>0},
+ [:"&.", 3, 7, 0, 7, 6] => {[:then, 4, 7, 0, 7, 6]=>0, [:else, 5, 7, 0, 7, 6]=>1},
+ [:"&.", 6, 8, 0, 8, 10] => {[:then, 7, 8, 0, 8, 10]=>1, [:else, 8, 8, 0, 8, 10]=>0},
+ [:"&.", 9, 9, 0, 9, 10] => {[:then, 10, 9, 0, 9, 10]=>0, [:else, 11, 9, 0, 9, 10]=>1},
}
}
assert_coverage(<<~"end;", { branches: true }, result)
- a = 10
+ class Dummy; def foo; end; def foo=(x); end; end
+ a = Dummy.new
b = nil
- a&.abs
- b&.hoo
+ c = Dummy.new
+ d = nil
+ a&.foo
+ b&.foo
+ c&.foo = 1
+ d&.foo = 1
end;
end
diff --git a/version.h b/version.h
index b15577cd97..0e5f5d34ae 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.0"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 7
+#define RUBY_PATCHLEVEL 8
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1