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

[PRISM] Enable branch coverage for &.

Browse Source
This commit is contained in:
Kevin Newton 2024-04-25 09:17:03 -04:00
parent 6509634eba
commit 235a3f3b7c
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
prism_compile.c
View File

@ -2808,6 +2808,27 @@ pm_scope_node_destroy(pm_scope_node_t *scope_node)
} }
} }
/**
* A prism-specific version of decl_branch_base that converts prism nodes into
* the required structure for branch coverage.
*/
static VALUE
pm_decl_branch_base(rb_iseq_t *iseq, rb_code_location_t *code_location, const pm_scope_node_t *scope_node, const pm_node_t *node, const char *type) {
// This is done in compile.c after the lines have already been extracted,
// but we want to avoid that work if we can, so we check early here.
if (!ISEQ_COVERAGE(iseq)) return Qfalse;
const pm_line_column_t start_location = PM_NODE_START_LINE_COLUMN(scope_node->parser, node);
const pm_line_column_t end_location = PM_NODE_END_LINE_COLUMN(scope_node->parser, node);
*code_location = (rb_code_location_t) {
.beg_pos = { .lineno = start_location.line, .column = start_location.column },
.end_pos = { .lineno = end_location.line, .column = end_location.column }
};
return decl_branch_base(iseq, PTR2NUM(node), code_location, type);
}
static void static void
pm_compile_call(rb_iseq_t *iseq, const pm_call_node_t *call_node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, ID method_id, LABEL *start) pm_compile_call(rb_iseq_t *iseq, const pm_call_node_t *call_node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node, ID method_id, LABEL *start)
{ {
@ -2818,9 +2839,18 @@ pm_compile_call(rb_iseq_t *iseq, const pm_call_node_t *call_node, LINK_ANCHOR *c
LABEL *else_label = NEW_LABEL(location.line); LABEL *else_label = NEW_LABEL(location.line);
LABEL *end_label = NEW_LABEL(location.line); LABEL *end_label = NEW_LABEL(location.line);
VALUE branches = Qfalse;
rb_code_location_t code_location;
int node_id = -1;
if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) { if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
branches = pm_decl_branch_base(iseq, &code_location, scope_node, (const pm_node_t *) call_node, "&.");
node_id = code_location.beg_pos.column;
PUSH_INSN(ret, location, dup); PUSH_INSN(ret, location, dup);
PUSH_INSNL(ret, location, branchnil, else_label); PUSH_INSNL(ret, location, branchnil, else_label);
add_trace_branch_coverage(iseq, ret, &code_location, node_id, 0, "then", branches);
} }
int flags = 0; int flags = 0;
@ -2889,7 +2919,10 @@ pm_compile_call(rb_iseq_t *iseq, const pm_call_node_t *call_node, LINK_ANCHOR *c
PUSH_LABEL(ret, else_label); PUSH_LABEL(ret, else_label);
} }
if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) || (block_iseq && ISEQ_BODY(block_iseq)->catch_table)) { if (PM_NODE_FLAG_P(call_node, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
add_trace_branch_coverage(iseq, ret, &code_location, node_id, 1, "else", branches);
PUSH_LABEL(ret, end_label);
} else if (block_iseq && ISEQ_BODY(block_iseq)->catch_table) {
PUSH_LABEL(ret, end_label); PUSH_LABEL(ret, end_label);
} }

2
test/.excludes-prism/TestCoverage.rb
View File

@ -1,9 +1,7 @@
exclude(:test_clear_with_branches, "unknown") exclude(:test_clear_with_branches, "unknown")
exclude(:test_eval, "unknown") exclude(:test_eval, "unknown")
exclude(:test_branch_coverage_for_while_statement, "branch coverage in while") exclude(:test_branch_coverage_for_while_statement, "branch coverage in while")
exclude(:test_coverage_optimized_branch, "branch coverage in &.")
exclude(:test_branch_coverage_for_if_statement, "branch coverage in if") exclude(:test_branch_coverage_for_if_statement, "branch coverage in if")
exclude(:test_branch_coverage_for_safe_method_invocation, "branch coverage in &.")
exclude(:test_branch_coverage_for_pattern_matching, "branch coverage in pattern matching") exclude(:test_branch_coverage_for_pattern_matching, "branch coverage in pattern matching")
exclude(:test_tag_break_with_branch_coverage, "branch coverage in &.") exclude(:test_tag_break_with_branch_coverage, "branch coverage in &.")
exclude(:test_branch_coverage_for_case_statement, "branch coverage in case") exclude(:test_branch_coverage_for_case_statement, "branch coverage in case")