diff options
| author | Vedant Kumar <vsk@apple.com> | 2017-08-02 23:35:24 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2017-08-02 23:35:24 +0000 |
| commit | f6b53455dfc6d257276e3f088d18fe7edb27c97d (patch) | |
| tree | 8ee510116734a2e28949fd9c32415a6385c0cece | |
| parent | 51c47348285aa98f37466dabc050857e6d48f05d (diff) | |
[llvm-cov] Respect the value of the -show-instantiations option
Make `-show-instantiations=false` actually skip displaying instantiation
sub-views, instead of simply ignoring the option.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309903 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | docs/CommandGuide/llvm-cov.rst | 1 | ||||
| -rw-r--r-- | test/tools/llvm-cov/showTemplateInstantiations.cpp | 4 | ||||
| -rw-r--r-- | tools/llvm-cov/CodeCoverage.cpp | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/docs/CommandGuide/llvm-cov.rst b/docs/CommandGuide/llvm-cov.rst index 3732b39740f..97064c82cf4 100644 --- a/docs/CommandGuide/llvm-cov.rst +++ b/docs/CommandGuide/llvm-cov.rst @@ -207,6 +207,7 @@ OPTIONS For source regions that are instantiated multiple times, such as templates in ``C++``, show each instantiation separately as well as the combined summary. + This option is enabled by default. .. option:: -show-regions diff --git a/test/tools/llvm-cov/showTemplateInstantiations.cpp b/test/tools/llvm-cov/showTemplateInstantiations.cpp index e2fc3709bc7..326eb99f10b 100644 --- a/test/tools/llvm-cov/showTemplateInstantiations.cpp +++ b/test/tools/llvm-cov/showTemplateInstantiations.cpp @@ -87,3 +87,7 @@ int main() { // ALL: [[@LINE]]| 1|int main() { // RUN: FileCheck -check-prefix=HTML-JUMP -input-file=%t.html.dir/coverage/tmp/showTemplateInstantiations.cpp.html %s // HTML-JUMP: <pre>Source (<a href='#L{{[0-9]+}}'>jump to first uncovered line</a>)</pre> // HTML-JUMP-NOT: <pre>Source (<a href='#L{{[0-9]+}}'>jump to first uncovered line</a>)</pre> + +// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -show-instantiations=false -filename-equivalence %s | FileCheck -check-prefix=NO_INSTS %s +// NO_INSTS-NOT: {{^ *}}| _Z4funcIbEiT_: +// NO_INSTS-NOT: {{^ *}}| _Z4funcIiEiT_: diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp index 073bd83e7af..c16d7b44ad6 100644 --- a/tools/llvm-cov/CodeCoverage.cpp +++ b/tools/llvm-cov/CodeCoverage.cpp @@ -288,6 +288,8 @@ CodeCoverageTool::createSourceFileView(StringRef SourceFile, auto View = SourceCoverageView::create(SourceFile, SourceBuffer.get(), ViewOpts, std::move(FileCoverage)); attachExpansionSubViews(*View, Expansions, Coverage); + if (!ViewOpts.ShowFunctionInstantiations) + return View; for (const auto *Function : Coverage.getInstantiations(SourceFile)) { std::unique_ptr<SourceCoverageView> SubView{nullptr}; @@ -696,7 +698,7 @@ int CodeCoverageTool::show(int argc, const char **argv, cl::opt<bool> ShowInstantiations("show-instantiations", cl::Optional, cl::desc("Show function instantiations"), - cl::cat(ViewCategory)); + cl::init(true), cl::cat(ViewCategory)); cl::opt<std::string> ShowOutputDirectory( "output-dir", cl::init(""), |