[llvm-cov[ Fix lcov coverage report contains functions from other compilation units.

[eagleonhill]

Summary

Patch by Chuan Qiu (@eagleonhill).

[lebedev.ri]

Test?

[Dor1s]

+1, the change looks good, but if you could modify the existing test for lcov export in a way so that it starts failing with the existing implementation but will pass after your chance, that'd be awesome.

[Dor1s]

In D63571#1551918, @Dor1s wrote:

+1, the change looks good, but if you could modify the existing test for lcov export in a way so that it starts failing with the existing implementation but will pass after your chance, that'd be awesome.

s/chance/change/

[Dor1s]

Apologies for the delayed review. LGTM and thanks for the fix!

[eagleonhill]

Thanks. Seems I don't have commit permission, could you help me do that or instruct me on how to merge it?

[Dor1s]

No problem, I'll commit it tomorrow on your behalf.

[Dor1s]

Getting ready to commit.

llvm/trunk/test/tools/llvm-cov/multiple-files.test

 // 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: ---
 // MANY_COMPONENTS-NEXT: {{^}}a{{[/\\]}}f2.c
 // MANY_COMPONENTS-NEXT: {{^}}b{{[/\\]}}c{{[/\\]}}f4.c
 // MANY_COMPONENTS-NEXT: {{^}}b{{[/\\]}}f3.c
 // MANY_COMPONENTS-NEXT: {{^}}f1.c
 
 // ONE_COMPONENT: Filename
 // 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

llvm/trunk/tools/llvm-cov/CoverageExporterLcov.cpp

 }
 
 void renderFile(raw_ostream &OS, const coverage::CoverageMapping &Coverage,
                 const std::string &Filename,
                 const FileCoverageSummary &FileReport, bool ExportSummaryOnly) {
   OS << "SF:" << Filename << '\n';
 
   if (!ExportSummaryOnly) {
-    renderFunctions(OS, Coverage.getCoveredFunctions());
+    renderFunctions(OS, Coverage.getCoveredFunctions(Filename));
   }
   renderFunctionSummary(OS, FileReport);
 
   if (!ExportSummaryOnly) {
     // Calculate and render detailed coverage information for given file.
     auto FileCoverage = Coverage.getCoverageForFile(Filename);
     renderLineExecutionCounts(OS, FileCoverage);
   }