NoQ created this revision. NoQ added reviewers: dcoughlin, xazax.hun, a_sidorin, rnkovacs, mikhail.ramalho, Szelethus, baloghadamsoftware, Charusso. Herald added subscribers: cfe-commits, dkrupp, donat.nagy, a.sidorin, szepet. Herald added a project: clang.
Put them into a dedicated header, as i'm about to write my second unittest. Repository: rC Clang https://reviews.llvm.org/D60739 Files: clang/unittests/StaticAnalyzer/Reusables.h clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp
Index: clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp =================================================================== --- clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp +++ clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp @@ -6,13 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "clang/ASTMatchers/ASTMatchFinder.h" -#include "clang/Frontend/CompilerInstance.h" -#include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" -#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" -#include "clang/CrossTU/CrossTranslationUnit.h" -#include "clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h" -#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h" +#include "Reusables.h" + #include "clang/Tooling/Tooling.h" #include "gtest/gtest.h" @@ -20,50 +15,6 @@ namespace ento { namespace { -using namespace ast_matchers; - -// A re-usable consumer that constructs ExprEngine out of CompilerInvocation. -// TODO: Actually re-use it when we write our second test. -class ExprEngineConsumer : public ASTConsumer { -protected: - CompilerInstance &C; - -private: - // We need to construct all of these in order to construct ExprEngine. - CheckerManager ChkMgr; - cross_tu::CrossTranslationUnitContext CTU; - PathDiagnosticConsumers Consumers; - AnalysisManager AMgr; - SetOfConstDecls VisitedCallees; - FunctionSummariesTy FS; - -protected: - ExprEngine Eng; - - // Find a declaration in the current AST by name. This has nothing to do - // with ExprEngine but turns out to be handy. - // TODO: There's probably a better place for it. - template <typename T> - const T *findDeclByName(const Decl *Where, StringRef Name) { - auto Matcher = decl(hasDescendant(namedDecl(hasName(Name)).bind("d"))); - auto Matches = match(Matcher, *Where, Eng.getContext()); - assert(Matches.size() == 1 && "Ambiguous name!"); - const T *Node = selectFirst<T>("d", Matches); - assert(Node && "Name not found!"); - return Node; - } - -public: - ExprEngineConsumer(CompilerInstance &C) - : C(C), ChkMgr(C.getASTContext(), *C.getAnalyzerOpts()), CTU(C), - Consumers(), - AMgr(C.getASTContext(), C.getDiagnostics(), Consumers, - CreateRegionStoreManager, CreateRangeConstraintManager, &ChkMgr, - *C.getAnalyzerOpts()), - VisitedCallees(), FS(), - Eng(CTU, AMgr, &VisitedCallees, &FS, ExprEngine::Inline_Regular) {} -}; - class SuperRegionLivenessConsumer : public ExprEngineConsumer { void performTest(const Decl *D) { const auto *FD = findDeclByName<FieldDecl>(D, "x"); @@ -99,7 +50,7 @@ } }; -class SuperRegionLivenessAction: public ASTFrontendAction { +class SuperRegionLivenessAction : public ASTFrontendAction { public: SuperRegionLivenessAction() {} std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler, Index: clang/unittests/StaticAnalyzer/Reusables.h =================================================================== --- /dev/null +++ clang/unittests/StaticAnalyzer/Reusables.h @@ -0,0 +1,58 @@ +//===- unittests/StaticAnalyzer/Reusables.h -------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/Frontend/CompilerInstance.h" +#include "clang/CrossTU/CrossTranslationUnit.h" +#include "clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h" + +namespace clang { +namespace ento { + +// Find a declaration in the current AST by name. +template <typename T> +const T *findDeclByName(const Decl *Where, StringRef Name) { + using namespace ast_matchers; + auto Matcher = decl(hasDescendant(namedDecl(hasName(Name)).bind("d"))); + auto Matches = match(Matcher, *Where, Where->getASTContext()); + assert(Matches.size() == 1 && "Ambiguous name!"); + const T *Node = selectFirst<T>("d", Matches); + assert(Node && "Name not found!"); + return Node; +} + +// A re-usable consumer that constructs ExprEngine out of CompilerInvocation. +class ExprEngineConsumer : public ASTConsumer { +protected: + CompilerInstance &C; + +private: + // We need to construct all of these in order to construct ExprEngine. + CheckerManager ChkMgr; + cross_tu::CrossTranslationUnitContext CTU; + PathDiagnosticConsumers Consumers; + AnalysisManager AMgr; + SetOfConstDecls VisitedCallees; + FunctionSummariesTy FS; + +protected: + ExprEngine Eng; + +public: + ExprEngineConsumer(CompilerInstance &C) + : C(C), ChkMgr(C.getASTContext(), *C.getAnalyzerOpts()), CTU(C), + Consumers(), + AMgr(C.getASTContext(), C.getDiagnostics(), Consumers, + CreateRegionStoreManager, CreateRangeConstraintManager, &ChkMgr, + *C.getAnalyzerOpts()), + VisitedCallees(), FS(), + Eng(CTU, AMgr, &VisitedCallees, &FS, ExprEngine::Inline_Regular) {} +}; + +} // namespace ento +} // namespace clang
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits