[llvm-cov] Use less space to describe source names
In r279628, we made SourceCoverageView list the binary associated with a
view and started adding labels (e.g "Source: foo" or "Function: bar") to
everything. Condense this information a bit to unclutter reports.
llvm-svn: 280896
diff --git a/llvm/tools/llvm-cov/CodeCoverage.cpp b/llvm/tools/llvm-cov/CodeCoverage.cpp
index 9755b60..e5b9b69 100644
--- a/llvm/tools/llvm-cov/CodeCoverage.cpp
+++ b/llvm/tools/llvm-cov/CodeCoverage.cpp
@@ -210,9 +210,9 @@
return nullptr;
auto Expansions = FunctionCoverage.getExpansions();
- auto View = SourceCoverageView::create(
- getSymbolForHumans(Function.Name), SourceBuffer.get(), ViewOpts,
- std::move(FunctionCoverage), /*FunctionView=*/true);
+ auto View = SourceCoverageView::create(getSymbolForHumans(Function.Name),
+ SourceBuffer.get(), ViewOpts,
+ std::move(FunctionCoverage));
attachExpansionSubViews(*View, Expansions, Coverage);
return View;
@@ -238,7 +238,7 @@
auto SubViewExpansions = SubViewCoverage.getExpansions();
auto SubView = SourceCoverageView::create(
getSymbolForHumans(Function->Name), SourceBuffer.get(), ViewOpts,
- std::move(SubViewCoverage), /*FunctionView=*/true);
+ std::move(SubViewCoverage));
attachExpansionSubViews(*SubView, SubViewExpansions, Coverage);
if (SubView) {
diff --git a/llvm/tools/llvm-cov/SourceCoverageView.cpp b/llvm/tools/llvm-cov/SourceCoverageView.cpp
index 47980ab..cfcaf2e 100644
--- a/llvm/tools/llvm-cov/SourceCoverageView.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageView.cpp
@@ -129,26 +129,28 @@
std::unique_ptr<SourceCoverageView>
SourceCoverageView::create(StringRef SourceName, const MemoryBuffer &File,
const CoverageViewOptions &Options,
- coverage::CoverageData &&CoverageInfo,
- bool FunctionView) {
+ coverage::CoverageData &&CoverageInfo) {
switch (Options.Format) {
case CoverageViewOptions::OutputFormat::Text:
return llvm::make_unique<SourceCoverageViewText>(
- SourceName, File, Options, std::move(CoverageInfo), FunctionView);
+ SourceName, File, Options, std::move(CoverageInfo));
case CoverageViewOptions::OutputFormat::HTML:
return llvm::make_unique<SourceCoverageViewHTML>(
- SourceName, File, Options, std::move(CoverageInfo), FunctionView);
+ SourceName, File, Options, std::move(CoverageInfo));
}
llvm_unreachable("Unknown coverage output format!");
}
-std::string SourceCoverageView::getNativeSourceName() const {
- std::string SourceFile = isFunctionView() ? "Function: " : "Source: ";
- SourceFile += getSourceName().str();
- SmallString<128> SourceText(SourceFile);
+std::string SourceCoverageView::getSourceName() const {
+ SmallString<128> SourceText(SourceName);
sys::path::remove_dots(SourceText, /*remove_dot_dots=*/true);
sys::path::native(SourceText);
- return SourceText.c_str();
+ return SourceText.str();
+}
+
+std::string SourceCoverageView::getVerboseSourceName() const {
+ return "Source: " + getSourceName() + " (Binary: " +
+ sys::path::filename(getOptions().ObjectFilename).str() + ")";
}
void SourceCoverageView::addExpansion(
diff --git a/llvm/tools/llvm-cov/SourceCoverageView.h b/llvm/tools/llvm-cov/SourceCoverageView.h
index 63c5b65..f2d5d61 100644
--- a/llvm/tools/llvm-cov/SourceCoverageView.h
+++ b/llvm/tools/llvm-cov/SourceCoverageView.h
@@ -172,9 +172,6 @@
/// on display.
std::vector<InstantiationView> InstantiationSubViews;
- /// Specifies whether or not the view is a function view.
- bool FunctionView;
-
/// Get the first uncovered line number for the source file.
unsigned getFirstUncoveredLineNo();
@@ -264,24 +261,24 @@
SourceCoverageView(StringRef SourceName, const MemoryBuffer &File,
const CoverageViewOptions &Options,
- coverage::CoverageData &&CoverageInfo, bool FunctionView)
+ coverage::CoverageData &&CoverageInfo)
: SourceName(SourceName), File(File), Options(Options),
- CoverageInfo(std::move(CoverageInfo)), FunctionView(FunctionView) {}
+ CoverageInfo(std::move(CoverageInfo)) {}
public:
static std::unique_ptr<SourceCoverageView>
create(StringRef SourceName, const MemoryBuffer &File,
const CoverageViewOptions &Options,
- coverage::CoverageData &&CoverageInfo, bool FucntionView = false);
+ coverage::CoverageData &&CoverageInfo);
virtual ~SourceCoverageView() {}
- StringRef getSourceName() const { return SourceName; }
-
/// \brief Return the source name formatted for the host OS.
- std::string getNativeSourceName() const;
+ std::string getSourceName() const;
- bool isFunctionView() const { return FunctionView; }
+ /// \brief Return a verbose description of the source name and the binary it
+ /// corresponds to.
+ std::string getVerboseSourceName() const;
const CoverageViewOptions &getOptions() const { return Options; }
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
index 52e594f..ca3f350 100644
--- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
@@ -341,12 +341,10 @@
void SourceCoverageViewHTML::renderSourceName(raw_ostream &OS, bool WholeFile,
unsigned FirstUncoveredLineNo) {
OS << BeginSourceNameDiv;
- // Render the source name for the view.
- OS << tag("pre", escape(getNativeSourceName(), getOptions()));
+ std::string ViewInfo = escape(
+ WholeFile ? getVerboseSourceName() : getSourceName(), getOptions());
+ OS << tag("pre", ViewInfo);
if (WholeFile) {
- // Render the object file name for the view.
- OS << tag("pre",
- escape("Binary: " + getOptions().ObjectFilename, getOptions()));
// Render the "Go to first unexecuted line" link for the view.
if (FirstUncoveredLineNo != 0) { // The file is not fully covered
std::string LinkText =
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.h b/llvm/tools/llvm-cov/SourceCoverageViewHTML.h
index 42fec6f..edbe7c4 100644
--- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.h
+++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.h
@@ -78,10 +78,9 @@
public:
SourceCoverageViewHTML(StringRef SourceName, const MemoryBuffer &File,
const CoverageViewOptions &Options,
- coverage::CoverageData &&CoverageInfo,
- bool FunctionView)
- : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo),
- FunctionView) {}
+ coverage::CoverageData &&CoverageInfo)
+ : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo)) {
+ }
};
} // namespace llvm
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
index 6dec4c7..3d2c067 100644
--- a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
@@ -65,12 +65,8 @@
void SourceCoverageViewText::renderSourceName(raw_ostream &OS, bool WholeFile,
unsigned FirstUncoveredLineNo) {
- getOptions().colored_ostream(OS, raw_ostream::CYAN) << getNativeSourceName()
- << ":\n";
- if (WholeFile) {
- getOptions().colored_ostream(OS, raw_ostream::CYAN)
- << "Binary: " << getOptions().ObjectFilename << ":\n";
- }
+ std::string ViewInfo = WholeFile ? getVerboseSourceName() : getSourceName();
+ getOptions().colored_ostream(OS, raw_ostream::CYAN) << ViewInfo << ":\n";
}
void SourceCoverageViewText::renderLinePrefix(raw_ostream &OS,
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.h b/llvm/tools/llvm-cov/SourceCoverageViewText.h
index dd78d3a..fe2642a 100644
--- a/llvm/tools/llvm-cov/SourceCoverageViewText.h
+++ b/llvm/tools/llvm-cov/SourceCoverageViewText.h
@@ -78,10 +78,9 @@
public:
SourceCoverageViewText(StringRef SourceName, const MemoryBuffer &File,
const CoverageViewOptions &Options,
- coverage::CoverageData &&CoverageInfo,
- bool FunctionView)
- : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo),
- FunctionView) {}
+ coverage::CoverageData &&CoverageInfo)
+ : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo)) {
+ }
};
} // namespace llvm