Skip to content

coverage: count coverage where explicitly requested by inference only #53125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

coverage: count coverage where explicitly requested by inference only #53125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0171d9
coverage: count coverage where explicitly requested by inference only
vtjnash Jan 30, 2024
55aa0f8
Merge branch 'master' into jn/over-coverage-fix
KristofferC Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8515,7 +8515,7 @@ static jl_llvm_functions_t
current_lineinfo.resize(new_lineinfo.size(), 0);
for (dbg = 0; dbg < new_lineinfo.size(); dbg++) {
unsigned newdbg = new_lineinfo[new_lineinfo.size() - dbg - 1];
if (newdbg != current_lineinfo[dbg]) {
if (newdbg != current_lineinfo[dbg] || dbg + 1 == new_lineinfo.size()) {
current_lineinfo[dbg] = newdbg;
const auto &info = linetable[newdbg];
if (do_coverage(info.is_user_code, info.is_tracked))
Expand Down Expand Up @@ -8605,14 +8605,15 @@ static jl_llvm_functions_t

find_next_stmt(0);
while (cursor != -1) {
ctx.noalias().aliasscope.current = aliasscopes[cursor];
jl_value_t *stmt = jl_array_ptr_ref(stmts, cursor);
int32_t debuginfoloc = jl_array_data(src->codelocs, int32_t)[cursor];
if (debuginfoloc > 0) {
if (debug_enabled)
ctx.builder.SetCurrentDebugLocation(linetable[debuginfoloc].loc);
coverageVisitStmt(debuginfoloc);
if (jl_is_expr(stmt) && ((jl_expr_t*)stmt)->head == jl_coverageeffect_sym)
coverageVisitStmt(debuginfoloc);
}
ctx.noalias().aliasscope.current = aliasscopes[cursor];
jl_value_t *stmt = jl_array_ptr_ref(stmts, cursor);
if (jl_is_returnnode(stmt)) {
jl_value_t *retexpr = jl_returnnode_value(stmt);
if (retexpr == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion test/testhelpers/coverage_file.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DA:5,0
DA:7,1
DA:8,1
DA:9,3
DA:10,5
DA:10,3
DA:11,1
DA:12,1
DA:14,0
Expand Down
2 changes: 1 addition & 1 deletion test/testhelpers/coverage_file.info.bad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DA:5,0
DA:7,1
DA:8,1
DA:9,3
DA:10,5
DA:10,3
DA:11,1
DA:12,1
DA:14,0
Expand Down
20 changes: 0 additions & 20 deletions test/testhelpers/coverage_file.info.bad2
View file
Open in desktop

This file was deleted.