replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[clang-tidy] Remove false decoupling in ClangTidyContext. NFC 

These getters/setters don't encapsulate any behavior, and can only be
called by friends.

llvm-svn: 345716
This commit is contained in:
Sam McCall 2018-10-31 13:08:19 +00:00
parent ec37188a86
commit dd2120c08f
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
View File

@ -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();
}

9
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h
View File

@ -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;

2
clang-tools-extra/clang-tidy/plugin/ClangTidyPlugin.cpp
View File

@ -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);