coverage: avoid double-counting entry line

fix #29785
JuliaLang · Jan 14, 2020 · 7cf6549 · 7cf6549
1 parent 7ad2ea5
commit 7cf6549
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -6475,8 +6475,15 @@ static std::unique_ptr<Module> emit_function(
         BB[label] = bb;
     }
 
-    if (do_coverage(mod_is_user_mod))
+    if (do_coverage(mod_is_user_mod)) {
         coverageVisitLine(ctx, ctx.file, toplineno);
+        if (linetable.size() >= 1) {
+            // avoid double-counting the entry line
+            const auto &info = linetable.at(1);
+            if (info.file == ctx.file && info.line == toplineno && info.is_user_code == mod_is_user_mod)
+                current_lineinfo.push_back(1);
+        }
+    }
     if (do_malloc_log(mod_is_user_mod))
         mallocVisitLine(ctx, ctx.file, toplineno);
     find_next_stmt(0);

diff --git a/test/testhelpers/coverage_file.info b/test/testhelpers/coverage_file.info
@@ -1,5 +1,5 @@
 SF:<FILENAME>
-DA:4,2
+DA:4,1
 DA:5,0
 DA:7,1
 DA:8,1
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     SF:<FILENAME>
-    DA:4,2
+    DA:4,1
     DA:5,0
     DA:7,1
     DA:8,1
@@ Expand Down @@