[PATCH] D63571: Fix lcov coverage report contains functions from other compilation units.

[Chuan Qiu via Phabricator via llvm-commits]

eagleonhill updated this revision to Diff 206130.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D63571/new/

https://reviews.llvm.org/D63571

Files:
  llvm/test/tools/llvm-cov/multiple-files.test
  llvm/tools/llvm-cov/CoverageExporterLcov.cpp


Index: llvm/tools/llvm-cov/CoverageExporterLcov.cpp
===================================================================
--- llvm/tools/llvm-cov/CoverageExporterLcov.cpp
+++ llvm/tools/llvm-cov/CoverageExporterLcov.cpp
@@ -83,7 +83,7 @@
   OS << "SF:" << Filename << '\n';
 
   if (!ExportSummaryOnly) {
-    renderFunctions(OS, Coverage.getCoveredFunctions());
+    renderFunctions(OS, Coverage.getCoveredFunctions(Filename));
   }
   renderFunctionSummary(OS, FileReport);
 
Index: llvm/test/tools/llvm-cov/multiple-files.test
===================================================================
--- llvm/test/tools/llvm-cov/multiple-files.test
+++ llvm/test/tools/llvm-cov/multiple-files.test
@@ -1,6 +1,7 @@
 // RUN: llvm-profdata merge %S/Inputs/multiple-files.proftext -o %t.profdata
 // RUN: llvm-cov report %S/Inputs/multiple-files.covmapping -instr-profile %t.profdata | FileCheck %s -check-prefix=MANY_COMPONENTS
 // RUN: llvm-cov report %S/Inputs/multiple-files2.covmapping -instr-profile %t.profdata | FileCheck %s -check-prefix=ONE_COMPONENT
+// RUN: llvm-cov export %S/Inputs/multiple-files.covmapping -instr-profile %t.profdata -format=lcov | FileCheck %s -check-prefix=LCOV
 
 // MANY_COMPONENTS: Filename
 // MANY_COMPONENTS-NEXT: ---
@@ -13,3 +14,14 @@
 // ONE_COMPONENT-NEXT: ---
 // ONE_COMPONENT-NEXT: {{^}}cov.c
 // ONE_COMPONENT-NEXT: {{^}}cov.h
+
+// LCOV-LABEL: SF:{{.*}}a{{[/\\]}}f2.c
+// LCOV: FN:1,f2
+// No extra funcs
+// LCOV-NOT: FN:
+// LCOV-LABEL: SF:{{.*}}b{{[/\\]}}c{{[/\\]}}f4.c
+// LCOV: FN:1,f4
+// LCOV-LABEL: SF:{{.*}}b{{[/\\]}}f3.c
+// LCOV: FN:1,f3
+// LCOV-LABEL: SF:{{.*}}f1.c
+// LCOV: FN:1,f1


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63571.206130.patch
Type: text/x-patch
Size: 1638 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190623/b2e16860/attachment.bin>