Revert "[llvm-cov] Create directory structure when filtering using -name*= options"
Test failures.
llvm-svn: 314314
diff --git a/llvm/tools/llvm-cov/CodeCoverage.cpp b/llvm/tools/llvm-cov/CodeCoverage.cpp
index 811ac53..1ea54a8 100644
--- a/llvm/tools/llvm-cov/CodeCoverage.cpp
+++ b/llvm/tools/llvm-cov/CodeCoverage.cpp
@@ -35,9 +35,7 @@
#include "llvm/Support/Threading.h"
#include "llvm/Support/ThreadPool.h"
#include "llvm/Support/ToolOutputFile.h"
-
#include <functional>
-#include <map>
#include <system_error>
using namespace llvm;
@@ -528,8 +526,7 @@
auto OS = std::move(OSOrErr.get());
View->print(*OS.get(), /*Wholefile=*/true,
- /*ShowSourceName=*/ShowFilenames,
- /*ShowTitle=*/ViewOpts.hasOutputDirectory());
+ /*ShowSourceName=*/ShowFilenames);
Printer->closeViewFile(std::move(OS));
}
@@ -848,54 +845,29 @@
auto Printer = CoveragePrinter::create(ViewOpts);
- if (SourceFiles.empty())
- // Get the source files from the function coverage mapping.
- for (StringRef Filename : Coverage->getUniqueSourceFiles())
- SourceFiles.push_back(Filename);
-
- // Create an index out of the source files.
- if (ViewOpts.hasOutputDirectory()) {
- if (Error E = Printer->createIndexFile(SourceFiles, *Coverage, Filters)) {
- error("Could not create index file!", toString(std::move(E)));
+ if (!Filters.empty()) {
+ auto OSOrErr = Printer->createViewFile("functions", /*InToplevel=*/true);
+ if (Error E = OSOrErr.takeError()) {
+ error("Could not create view file!", toString(std::move(E)));
return 1;
}
- }
+ auto OS = std::move(OSOrErr.get());
- if (!Filters.empty()) {
- // Build the map of filenames to functions.
- std::map<llvm::StringRef, std::vector<const FunctionRecord *>>
- FilenameFunctionMap;
- for (const auto &SourceFile : SourceFiles)
- for (const auto &Function : Coverage->getCoveredFunctions(SourceFile))
- if (Filters.matches(*Coverage.get(), Function))
- FilenameFunctionMap[SourceFile].push_back(&Function);
+ // Show functions.
+ for (const auto &Function : Coverage->getCoveredFunctions()) {
+ if (!Filters.matches(*Coverage.get(), Function))
+ continue;
- // Only print filter matching functions for each file.
- for (const auto &FileFunc : FilenameFunctionMap) {
- const StringRef &File = FileFunc.first;
- const auto &Functions = FileFunc.second;
-
- auto OSOrErr = Printer->createViewFile(File, /*InToplevel=*/false);
- if (Error E = OSOrErr.takeError()) {
- error("Could not create view file!", toString(std::move(E)));
- return 1;
- }
- auto OS = std::move(OSOrErr.get());
-
- bool ShowTitle = true;
- for (const auto *Function : Functions) {
- auto FunctionView = createFunctionView(*Function, *Coverage);
- if (!FunctionView) {
- warning("Could not read coverage for '" + Function->Name + "'.");
- continue;
- }
- FunctionView->print(*OS.get(), /*WholeFile=*/false,
- /*ShowSourceName=*/true, ShowTitle);
- ShowTitle = false;
+ auto mainView = createFunctionView(Function, *Coverage);
+ if (!mainView) {
+ warning("Could not read coverage for '" + Function.Name + "'.");
+ continue;
}
- Printer->closeViewFile(std::move(OS));
+ mainView->print(*OS.get(), /*WholeFile=*/false, /*ShowSourceName=*/true);
}
+
+ Printer->closeViewFile(std::move(OS));
return 0;
}
@@ -904,6 +876,19 @@
(SourceFiles.size() != 1) || ViewOpts.hasOutputDirectory() ||
(ViewOpts.Format == CoverageViewOptions::OutputFormat::HTML);
+ if (SourceFiles.empty())
+ // Get the source files from the function coverage mapping.
+ for (StringRef Filename : Coverage->getUniqueSourceFiles())
+ SourceFiles.push_back(Filename);
+
+ // Create an index out of the source files.
+ if (ViewOpts.hasOutputDirectory()) {
+ if (Error E = Printer->createIndexFile(SourceFiles, *Coverage)) {
+ error("Could not create index file!", toString(std::move(E)));
+ return 1;
+ }
+ }
+
// If NumThreads is not specified, auto-detect a good default.
if (NumThreads == 0)
NumThreads =