1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile.c (branch_coverage_valid_p): Refactored out

Browse Source
This commit is contained in:
Yusuke Endoh 2020-06-19 12:48:30 +09:00
parent 37cd877dbd
commit 4b523e79a0
Notes: git 2020-06-20 09:28:29 +09:00 
Merged: https://github.com/ruby/ruby/pull/3240
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compile.c
View File

@ -595,12 +595,17 @@ APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LI
#define APPEND_ELEM(anchor, before, elem) APPEND_ELEM(iseq, (anchor), (before), (elem)) #define APPEND_ELEM(anchor, before, elem) APPEND_ELEM(iseq, (anchor), (before), (elem))
#endif #endif
static int branch_coverage_valid_p(rb_iseq_t *iseq, int first_line)
{
if (!ISEQ_COVERAGE(iseq)) return 0;
if (!ISEQ_BRANCH_COVERAGE(iseq)) return 0;
if (first_line <= 0) return 0;
return 1;
}
static VALUE decl_branch_base(rb_iseq_t *iseq, int first_line, int first_column, int last_line, int last_column, const char *type) static VALUE decl_branch_base(rb_iseq_t *iseq, int first_line, int first_column, int last_line, int last_column, const char *type)
{ {
// check if branch coverage is enabled if (!branch_coverage_valid_p(iseq, first_line)) return Qundef;
if (!ISEQ_COVERAGE(iseq)) return Qundef;
if (!ISEQ_BRANCH_COVERAGE(iseq)) return Qundef;
if (first_line <= 0) return Qundef;
VALUE structure = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 0); VALUE structure = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 0);
VALUE branches = rb_ary_tmp_new(5); VALUE branches = rb_ary_tmp_new(5);
@ -616,10 +621,7 @@ static VALUE decl_branch_base(rb_iseq_t *iseq, int first_line, int first_column,
static void add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int first_line, int first_column, int last_line, int last_column, const char *type, VALUE branches) static void add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int first_line, int first_column, int last_line, int last_column, const char *type, VALUE branches)
{ {
// check if branch coverage is enabled if (!branch_coverage_valid_p(iseq, first_line)) return;
if (!ISEQ_COVERAGE(iseq)) return;
if (!ISEQ_BRANCH_COVERAGE(iseq)) return;
if (first_line <= 0) return;
VALUE counters = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 1); VALUE counters = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 1);
long counter_idx = RARRAY_LEN(counters); long counter_idx = RARRAY_LEN(counters);