nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[llvm-cov] Add an -output-dir option for the show sub-command"

Browse Source 
This reverts commit r273971. test/profile/instrprof-visibility.cpp is
failing because of an uncaught error in SafelyCloseFileDescriptor.

llvm-svn: 273978
This commit is contained in:
Vedant Kumar
2016-06-28 01:14:04 +00:00
parent b4d9503171
commit a48d9fe86a
8 changed files with 6 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
llvm/tools/llvm-cov/CodeCoverage.cpp
View File

@@ -406,12 +406,6 @@ int CodeCoverageTool::show(int argc, const char **argv,
clEnumValEnd),
cl::init(CoverageViewOptions::OutputFormat::Text));
cl::opt<std::string> ShowOutputDirectory(
"output-dir", cl::init(""),
cl::desc("Directory in which coverage information is written out"));
cl::alias ShowOutputDirectoryA("o", cl::desc("Alias for --output-dir"),
cl::aliasopt(ShowOutputDirectory));
auto Err = commandLineParser(argc, argv);
if (Err)
return Err;
@@ -424,14 +418,6 @@ int CodeCoverageTool::show(int argc, const char **argv,
ViewOpts.ShowExpandedRegions = ShowExpansions;
ViewOpts.ShowFunctionInstantiations = ShowInstantiations;
ViewOpts.ShowFormat = ShowFormat;
ViewOpts.ShowOutputDirectory = ShowOutputDirectory;
if (ViewOpts.ShowOutputDirectory != "") {
if (auto E = sys::fs::create_directories(ViewOpts.ShowOutputDirectory)) {
error("Could not create output directory!", E.message());
return 1;
}
}
auto Coverage = load();
if (!Coverage)
@@ -450,17 +436,8 @@ int CodeCoverageTool::show(int argc, const char **argv,
<< "\n";
continue;
}
auto OSOrErr =
mainView->createOutputFile("functions", /*InToplevel=*/true);
if (Error E = OSOrErr.takeError()) {
handleAllErrors(OSOrErr.takeError(),
[&](const ErrorInfoBase &EI) { error(EI.message()); });
return 1;
}
std::unique_ptr<raw_ostream> OS = std::move(OSOrErr.get());
mainView->print(*OS.get(), /*WholeFile=*/false, /*ShowSourceName=*/true);
mainView->closeOutputFile(std::move(OS));
mainView->print(outs(), /*WholeFile=*/false, /*ShowSourceName=*/true);
outs() << "\n";
}
return 0;
}
@@ -482,16 +459,10 @@ int CodeCoverageTool::show(int argc, const char **argv,
continue;
}
auto OSOrErr = mainView->createOutputFile(SourceFile, /*InToplevel=*/false);
if (Error E = OSOrErr.takeError()) {
handleAllErrors(OSOrErr.takeError(),
[&](const ErrorInfoBase &EI) { error(EI.message()); });
return 1;
}
std::unique_ptr<raw_ostream> OS = std::move(OSOrErr.get());
mainView->print(*OS.get(), /*Wholefile=*/true,
mainView->print(outs(), /*Wholefile=*/true,
/*ShowSourceName=*/ShowFilenames);
mainView->closeOutputFile(std::move(OS));
if (SourceFiles.size() > 1)
outs() << "\n";
}
return 0;