diff options
3 files changed, 4 insertions, 21 deletions
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp index a1c76fbacdf..55ba044c257 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -199,10 +199,6 @@ DiagnosticBuilder ClangTidyContext::diag( return DiagEngine->Report(Loc, ID); } -void ClangTidyContext::setDiagnosticsEngine(DiagnosticsEngine *Engine) { - DiagEngine = Engine; -} - void ClangTidyContext::setSourceManager(SourceManager *SourceMgr) { DiagEngine->setSourceManager(SourceMgr); } @@ -259,11 +255,6 @@ bool ClangTidyContext::treatAsError(StringRef CheckName) const { return WarningAsErrorFilter->contains(CheckName); } -/// \brief Store a \c ClangTidyError. -void ClangTidyContext::storeError(const ClangTidyError &Error) { - Errors.push_back(Error); -} - StringRef ClangTidyContext::getCheckName(unsigned DiagnosticID) const { llvm::DenseMap<unsigned, std::string>::const_iterator I = CheckNamesByDiagnosticID.find(DiagnosticID); @@ -281,7 +272,7 @@ ClangTidyDiagnosticConsumer::ClangTidyDiagnosticConsumer( Diags = llvm::make_unique<DiagnosticsEngine>( IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), &*DiagOpts, this, /*ShouldOwnClient=*/false); - Context.setDiagnosticsEngine(Diags.get()); + Context.DiagEngine = Diags.get(); } void ClangTidyDiagnosticConsumer::finalizeLastError() { @@ -684,7 +675,6 @@ void ClangTidyDiagnosticConsumer::finish() { if (RemoveIncompatibleErrors) removeIncompatibleErrors(Errors); - for (const ClangTidyError &Error : Errors) - Context.storeError(Error); + std::move(Errors.begin(), Errors.end(), std::back_inserter(Context.Errors)); Errors.clear(); } diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h index ae25013da73..c138b36d846 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -192,17 +192,10 @@ public: } private: - // Calls setDiagnosticsEngine() and storeError(). + // Sets DiagEngine and Errors. friend class ClangTidyDiagnosticConsumer; friend class ClangTidyPluginAction; - /// \brief Sets the \c DiagnosticsEngine so that Diagnostics can be generated - /// correctly. - void setDiagnosticsEngine(DiagnosticsEngine *Engine); - - /// \brief Store an \p Error. - void storeError(const ClangTidyError &Error); - std::vector<ClangTidyError> Errors; DiagnosticsEngine *DiagEngine; std::unique_ptr<ClangTidyOptionsProvider> OptionsProvider; diff --git a/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp b/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp index 22448939e83..da1e2255821 100644 --- a/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp +++ b/clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp @@ -35,7 +35,7 @@ public: std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler, StringRef File) override { // Insert the current diagnostics engine. - Context->setDiagnosticsEngine(&Compiler.getDiagnostics()); + Context->DiagEngine = &Compiler.getDiagnostics(); // Create the AST consumer. ClangTidyASTConsumerFactory Factory(*Context); |
