From b79ed97962dfdc2fbbf7ceea2b5cd52a7ad27012 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Thu, 4 Sep 2014 00:04:54 +0000 Subject: [PATCH] llvm-cov: Don't pointlessly create a unique_ptr (NFC) There's no ownership going on here, and no reason to heap allocate this object. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217113 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-cov/CodeCoverage.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp index a5e039c83e2..bc77a9ee285 100644 --- a/tools/llvm-cov/CodeCoverage.cpp +++ b/tools/llvm-cov/CodeCoverage.cpp @@ -615,18 +615,17 @@ int CodeCoverageTool::show(int argc, const char **argv, if (findMainViewFileID(Function, MainFileID)) continue; StringRef SourceFile = Function.Filenames[MainFileID]; - std::unique_ptr mainView; auto SourceBuffer = getSourceFile(SourceFile); if (!SourceBuffer) return 1; auto Range = findExpandedFileInterestingLineRange(MainFileID, Function); - mainView.reset(new SourceCoverageView(SourceBuffer.get(), ViewOpts, - Range.first, Range.second)); - createSourceFileView(SourceFile, *mainView, Function, true); + SourceCoverageView mainView(SourceBuffer.get(), ViewOpts, Range.first, + Range.second); + createSourceFileView(SourceFile, mainView, Function, true); ViewOpts.colored_ostream(outs(), raw_ostream::CYAN) << Function.PrettyName << " from " << SourceFile << ":"; outs() << "\n"; - mainView->render(outs()); + mainView.render(outs()); if (FunctionMappingRecords.size() > 1) outs() << "\n"; } @@ -648,12 +647,11 @@ int CodeCoverageTool::show(int argc, const char **argv, } for (const auto &SourceFile : SourceFiles) { - std::unique_ptr mainView; auto SourceBuffer = getSourceFile(SourceFile); if (!SourceBuffer) return 1; - mainView.reset(new SourceCoverageView(SourceBuffer.get(), ViewOpts)); - if (createSourceFileView(SourceFile, *mainView, FunctionMappingRecords)) { + SourceCoverageView mainView(SourceBuffer.get(), ViewOpts); + if (createSourceFileView(SourceFile, mainView, FunctionMappingRecords)) { ViewOpts.colored_ostream(outs(), raw_ostream::RED) << "warning: The file '" << SourceFile << "' isn't covered."; outs() << "\n"; @@ -664,7 +662,7 @@ int CodeCoverageTool::show(int argc, const char **argv, ViewOpts.colored_ostream(outs(), raw_ostream::CYAN) << SourceFile << ":"; outs() << "\n"; } - mainView->render(outs()); + mainView.render(outs()); if (SourceFiles.size() > 1) outs() << "\n"; } -- 2.34.1