diff options
Diffstat (limited to 'lib/StaticAnalyzer')
-rw-r--r-- | lib/StaticAnalyzer/Checkers/CMakeLists.txt | 12 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/Checkers.td | 18 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.cpp | 135 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.h | 29 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/ClangSACheckers.h | 34 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/ExprEngine.cpp | 2 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/Makefile | 7 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Core/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Core/CheckerManager.cpp | 26 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Core/CoreEngine.cpp | 1 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp | 4 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Frontend/AnalysisConsumer.h | 4 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Frontend/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp | 50 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Frontend/FrontendActions.cpp | 2 |
15 files changed, 325 insertions, 1 deletions
diff --git a/lib/StaticAnalyzer/Checkers/CMakeLists.txt b/lib/StaticAnalyzer/Checkers/CMakeLists.txt index 7db858dcfb..c96b42db1e 100644 --- a/lib/StaticAnalyzer/Checkers/CMakeLists.txt +++ b/lib/StaticAnalyzer/Checkers/CMakeLists.txt @@ -1,3 +1,14 @@ +set(LLVM_TARGET_DEFINITIONS Checkers.td) +tablegen(Checkers.inc + -gen-clang-sa-checkers + -I ${CMAKE_CURRENT_SOURCE_DIR}/../../../include) +add_custom_target(ClangSACheckers + DEPENDS Checkers.inc) + +# So 'Checkers.inc' can be included from the cmake build directory. +# FIXME: Someone more familiar with cmake should enable this for all of LLVM. +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${CMAKE_CURRENT_BINARY_DIR}") + set(LLVM_USED_LIBS clangBasic clangAST) add_clang_library(clangStaticAnalyzerCheckers @@ -17,6 +28,7 @@ add_clang_library(clangStaticAnalyzerCheckers CheckSecuritySyntaxOnly.cpp CheckSizeofPointer.cpp ChrootChecker.cpp + ClangSACheckerProvider.cpp DeadStoresChecker.cpp DereferenceChecker.cpp DivZeroChecker.cpp diff --git a/lib/StaticAnalyzer/Checkers/Checkers.td b/lib/StaticAnalyzer/Checkers/Checkers.td new file mode 100644 index 0000000000..2a2f3eed0c --- /dev/null +++ b/lib/StaticAnalyzer/Checkers/Checkers.td @@ -0,0 +1,18 @@ +//===--- Checkers.td - Static Analyzer Checkers -===-----------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +include "clang/StaticAnalyzer/Checkers/CheckerBase.td" + +def Cocoa : Package<"cocoa">; + +def : Checker<"ObjCSelfInitChecker">, + InPackage<Cocoa>, + Named<"SelfInit">, + HelpText<"Check that 'self' is propely initialized inside an initializer method">, + DescFile<"ObjCSelfInitChecker.cpp">; diff --git a/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.cpp b/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.cpp new file mode 100644 index 0000000000..12178fcd8c --- /dev/null +++ b/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.cpp @@ -0,0 +1,135 @@ +//===--- ClangSACheckerProvider.cpp - Clang SA Checkers Provider ----------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Defines the CheckerProvider for the checkers defined in +// libclangStaticAnalyzerCheckers. +// +//===----------------------------------------------------------------------===// + +#include "ClangSACheckerProvider.h" +#include "ClangSACheckers.h" +#include "clang/StaticAnalyzer/Core/CheckerManager.h" +#include "clang/StaticAnalyzer/Core/CheckerProvider.h" +#include "llvm/ADT/DenseSet.h" + +using namespace clang; +using namespace ento; + +namespace { + +/// \brief Provider for all the checkers in libclangStaticAnalyzerCheckers. +class ClangSACheckerProvider : public CheckerProvider { +public: + virtual void registerCheckers(CheckerManager &checkerMgr, + CheckerOptInfo *checkOpts, unsigned numCheckOpts); +}; + +} + +CheckerProvider *ento::createClangSACheckerProvider() { + return new ClangSACheckerProvider(); +} + +namespace { + +struct StaticCheckerInfoRec { + const char *FullName; + CheckerManager::RegisterFunc RegFunc; + bool Hidden; +}; + +} // end anonymous namespace. + +static const StaticCheckerInfoRec StaticCheckerInfo[] = { +#define GET_CHECKERS +#define CHECKER(FULLNAME,CLASS,DESCFILE,HELPTEXT,HIDDEN) \ + { FULLNAME, register##CLASS, HIDDEN }, +#include "Checkers.inc" + { 0, 0, 0} +#undef CHECKER +#undef GET_CHECKERS +}; + +namespace { + +struct CheckNameOption { + const char *Name; + const short *Members; + const short *SubGroups; +}; + +} // end anonymous namespace. + +#define GET_MEMBER_ARRAYS +#include "Checkers.inc" +#undef GET_MEMBER_ARRAYS + +// The table of check name options, sorted by name for fast binary lookup. +static const CheckNameOption CheckNameTable[] = { +#define GET_CHECKNAME_TABLE +#include "Checkers.inc" +#undef GET_CHECKNAME_TABLE +}; +static const size_t + CheckNameTableSize = sizeof(CheckNameTable) / sizeof(CheckNameTable[0]); + +static bool CheckNameOptionCompare(const CheckNameOption &LHS, + const CheckNameOption &RHS) { + return strcmp(LHS.Name, RHS.Name) < 0; +} + +static void collectCheckers(const CheckNameOption *checkName, + bool enable, + llvm::DenseSet<const StaticCheckerInfoRec *> &checkers, + bool collectHidden) { + if (const short *member = checkName->Members) { + if (enable) { + if (collectHidden || !StaticCheckerInfo[*member].Hidden) + checkers.insert(&StaticCheckerInfo[*member]); + } else { + for (; *member != -1; ++member) + checkers.erase(&StaticCheckerInfo[*member]); + } + } + + // Enable/disable all subgroups along with this one. + if (const short *subGroups = checkName->SubGroups) { + for (; *subGroups != -1; ++subGroups) + collectCheckers(&CheckNameTable[*subGroups], enable, checkers, + /*don't enable hidden in subgroups*/ false); + } +} + +static void collectCheckers(CheckerOptInfo &opt, + llvm::DenseSet<const StaticCheckerInfoRec *> &checkers) { + const char *optName = opt.getName(); + CheckNameOption key = { optName, 0, 0 }; + const CheckNameOption *found = + std::lower_bound(CheckNameTable, CheckNameTable + CheckNameTableSize, key, + CheckNameOptionCompare); + if (found == CheckNameTable + CheckNameTableSize || + strcmp(found->Name, optName) != 0) + return; // Check name not found. + + opt.claim(); + collectCheckers(found, opt.isEnabled(), checkers, /*collectHidden=*/true); +} + +#include "llvm/Support/raw_ostream.h" + +void ClangSACheckerProvider::registerCheckers(CheckerManager &checkerMgr, + CheckerOptInfo *checkOpts, unsigned numCheckOpts) { + llvm::DenseSet<const StaticCheckerInfoRec *> enabledCheckers; + for (unsigned i = 0; i != numCheckOpts; ++i) + collectCheckers(checkOpts[i], enabledCheckers); + for (llvm::DenseSet<const StaticCheckerInfoRec *>::iterator + I = enabledCheckers.begin(), E = enabledCheckers.end(); I != E; ++I) { + checkerMgr.addCheckerRegisterFunction((*I)->RegFunc); + } +} diff --git a/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.h b/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.h new file mode 100644 index 0000000000..f6c80119fd --- /dev/null +++ b/lib/StaticAnalyzer/Checkers/ClangSACheckerProvider.h @@ -0,0 +1,29 @@ +//===--- ClangSACheckerProvider.h - Clang SA Checkers Provider --*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Defines the entry point for creating the provider for the checkers defined +// in libclangStaticAnalyzerCheckers. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_SA_CHECKERS_CLANGSACHECKERPROVIDER_H +#define LLVM_CLANG_SA_CHECKERS_CLANGSACHECKERPROVIDER_H + +namespace clang { + +namespace ento { + class CheckerProvider; + +CheckerProvider *createClangSACheckerProvider(); + +} // end ento namespace + +} // end clang namespace + +#endif diff --git a/lib/StaticAnalyzer/Checkers/ClangSACheckers.h b/lib/StaticAnalyzer/Checkers/ClangSACheckers.h new file mode 100644 index 0000000000..b01b0f4c54 --- /dev/null +++ b/lib/StaticAnalyzer/Checkers/ClangSACheckers.h @@ -0,0 +1,34 @@ +//===--- ClangSACheckers.h - Registration functions for Checkers *- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Declares the registation functions for the checkers defined in +// libclangStaticAnalyzerCheckers. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_SA_LIB_CHECKERS_CLANGSACHECKERS_H +#define LLVM_CLANG_SA_LIB_CHECKERS_CLANGSACHECKERS_H + +namespace clang { + +namespace ento { +class ExprEngine; + +#define GET_CHECKERS +#define CHECKER(FULLNAME,CLASS,CXXFILE,HELPTEXT,HIDDEN) \ + void register##CLASS(ExprEngine &Eng); +#include "Checkers.inc" +#undef CHECKER +#undef GET_CHECKERS + +} // end ento namespace + +} // end clang namespace + +#endif diff --git a/lib/StaticAnalyzer/Checkers/ExprEngine.cpp b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp index dea2c28010..26523d368b 100644 --- a/lib/StaticAnalyzer/Checkers/ExprEngine.cpp +++ b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp @@ -16,6 +16,7 @@ // FIXME: Restructure checker registration. #include "InternalChecks.h" +#include "clang/StaticAnalyzer/Core/CheckerManager.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" #include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h" #include "clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h" @@ -332,6 +333,7 @@ ExprEngine::ExprEngine(AnalysisManager &mgr, TransferFuncs *tf) NSExceptionII(NULL), NSExceptionInstanceRaiseSelectors(NULL), RaiseSel(GetNullarySelector("raise", getContext())), BR(mgr, *this), TF(tf) { + mgr.getCheckerManager()->registerCheckersToEngine(*this); // Register internal checks. RegisterInternalChecks(*this); diff --git a/lib/StaticAnalyzer/Checkers/Makefile b/lib/StaticAnalyzer/Checkers/Makefile index d4de35c1f5..a9a2bebf44 100644 --- a/lib/StaticAnalyzer/Checkers/Makefile +++ b/lib/StaticAnalyzer/Checkers/Makefile @@ -14,4 +14,11 @@ CLANG_LEVEL := ../../.. LIBRARYNAME := clangStaticAnalyzerCheckers +BUILT_SOURCES = Checkers.inc +TABLEGEN_INC_FILES_COMMON = 1 + include $(CLANG_LEVEL)/Makefile + +$(ObjDir)/Checkers.inc.tmp : Checkers.td $(TBLGEN) $(ObjDir)/.dir + $(Echo) "Building Clang SA Checkers tables with tblgen" + $(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $< diff --git a/lib/StaticAnalyzer/Core/CMakeLists.txt b/lib/StaticAnalyzer/Core/CMakeLists.txt index 357cf31e27..14c636cf76 100644 --- a/lib/StaticAnalyzer/Core/CMakeLists.txt +++ b/lib/StaticAnalyzer/Core/CMakeLists.txt @@ -13,6 +13,7 @@ add_clang_library(clangStaticAnalyzerCore CFRefCount.cpp Checker.cpp CheckerHelpers.cpp + CheckerManager.cpp Environment.cpp ExplodedGraph.cpp FlatStore.cpp diff --git a/lib/StaticAnalyzer/Core/CheckerManager.cpp b/lib/StaticAnalyzer/Core/CheckerManager.cpp new file mode 100644 index 0000000000..0dd56e6c19 --- /dev/null +++ b/lib/StaticAnalyzer/Core/CheckerManager.cpp @@ -0,0 +1,26 @@ +//===--- CheckerManager.cpp - Static Analyzer Checker Manager -------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Defines the Static Analyzer Checker Manager. +// +//===----------------------------------------------------------------------===// + +#include "clang/StaticAnalyzer/Core/CheckerManager.h" +#include "clang/StaticAnalyzer/Core/CheckerProvider.h" + +using namespace clang; +using namespace ento; + +void CheckerManager::registerCheckersToEngine(ExprEngine &eng) { + for (unsigned i = 0, e = Funcs.size(); i != e; ++i) + Funcs[i](eng); +} + +// Anchor for the vtable. +CheckerProvider::~CheckerProvider() { } diff --git a/lib/StaticAnalyzer/Core/CoreEngine.cpp b/lib/StaticAnalyzer/Core/CoreEngine.cpp index 609b0aa274..e814361777 100644 --- a/lib/StaticAnalyzer/Core/CoreEngine.cpp +++ b/lib/StaticAnalyzer/Core/CoreEngine.cpp @@ -773,6 +773,7 @@ void CallEnterNodeBuilder::generateNode(const GRState *state) { OldMgr.getPathDiagnosticClient(), OldMgr.getStoreManagerCreator(), OldMgr.getConstraintManagerCreator(), + OldMgr.getCheckerManager(), OldMgr.getIndexer(), OldMgr.getMaxNodes(), OldMgr.getMaxVisit(), OldMgr.shouldVisualizeGraphviz(), diff --git a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp index 47c7508f6b..38a1966c71 100644 --- a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp +++ b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp @@ -20,6 +20,7 @@ #include "clang/Analysis/Analyses/LiveVariables.h" #include "clang/Analysis/Analyses/UninitializedValues.h" #include "clang/Analysis/CFG.h" +#include "clang/StaticAnalyzer/Core/CheckerManager.h" #include "clang/StaticAnalyzer/Checkers/LocalCheckers.h" #include "clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h" #include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h" @@ -92,6 +93,7 @@ public: StoreManagerCreator CreateStoreMgr; ConstraintManagerCreator CreateConstraintMgr; + llvm::OwningPtr<CheckerManager> checkerMgr; llvm::OwningPtr<AnalysisManager> Mgr; AnalysisConsumer(const Preprocessor& pp, @@ -175,9 +177,11 @@ public: virtual void Initialize(ASTContext &Context) { Ctx = &Context; + checkerMgr.reset(registerCheckers(Opts, PP.getDiagnostics())); Mgr.reset(new AnalysisManager(*Ctx, PP.getDiagnostics(), PP.getLangOptions(), PD, CreateStoreMgr, CreateConstraintMgr, + checkerMgr.get(), /* Indexer */ 0, Opts.MaxNodes, Opts.MaxLoop, Opts.VisualizeEGDot, Opts.VisualizeEGUbi, diff --git a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h index 86f6c727a4..d382bdf0f5 100644 --- a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h +++ b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h @@ -22,8 +22,10 @@ namespace clang { class AnalyzerOptions; class ASTConsumer; class Preprocessor; +class Diagnostic; namespace ento { +class CheckerManager; /// CreateAnalysisConsumer - Creates an ASTConsumer to run various code /// analysis passes. (The set of analyses run is controlled by command-line @@ -32,6 +34,8 @@ ASTConsumer* CreateAnalysisConsumer(const Preprocessor &pp, const std::string &output, const AnalyzerOptions& Opts); +CheckerManager *registerCheckers(const AnalyzerOptions &opts,Diagnostic &diags); + } // end GR namespace } // end clang namespace diff --git a/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/lib/StaticAnalyzer/Frontend/CMakeLists.txt index 66a994bf5c..505c0cf440 100644 --- a/lib/StaticAnalyzer/Frontend/CMakeLists.txt +++ b/lib/StaticAnalyzer/Frontend/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite) add_clang_library(clangStaticAnalyzerFrontend AnalysisConsumer.cpp + CheckerRegistration.cpp FrontendActions.cpp ) diff --git a/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp b/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp new file mode 100644 index 0000000000..ca25f71823 --- /dev/null +++ b/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp @@ -0,0 +1,50 @@ +//===--- CheckerRegistration.cpp - Registration for the Analyzer Checkers -===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Defines the registration function for the analyzer checkers. +// +//===----------------------------------------------------------------------===// + +#include "AnalysisConsumer.h" +#include "../Checkers/ClangSACheckerProvider.h" +#include "clang/StaticAnalyzer/Core/CheckerManager.h" +#include "clang/StaticAnalyzer/Core/CheckerProvider.h" +#include "clang/Frontend/AnalyzerOptions.h" +#include "clang/Frontend/FrontendDiagnostic.h" +#include "clang/Basic/Diagnostic.h" +#include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/SmallVector.h" + +using namespace clang; +using namespace ento; + +CheckerManager *ento::registerCheckers(const AnalyzerOptions &opts, + Diagnostic &diags) { + llvm::OwningPtr<CheckerManager> checkerMgr(new CheckerManager()); + + llvm::SmallVector<CheckerOptInfo, 8> checkerOpts; + for (unsigned i = 0, e = opts.CheckersControlList.size(); i != e; ++i) { + const std::pair<std::string, bool> &opt = opts.CheckersControlList[i]; + checkerOpts.push_back(CheckerOptInfo(opt.first.c_str(), opt.second)); + } + + llvm::OwningPtr<CheckerProvider> provider(createClangSACheckerProvider()); + provider->registerCheckers(*checkerMgr, + checkerOpts.data(), checkerOpts.size()); + + // FIXME: Load CheckerProviders from plugins. + + for (unsigned i = 0, e = checkerOpts.size(); i != e; ++i) { + if (checkerOpts[i].isUnclaimed()) + diags.Report(diag::warn_unkwown_analyzer_checker) + << checkerOpts[i].getName(); + } + + return checkerMgr.take(); +} diff --git a/lib/StaticAnalyzer/Frontend/FrontendActions.cpp b/lib/StaticAnalyzer/Frontend/FrontendActions.cpp index 2bb000c3cc..a59cc6888f 100644 --- a/lib/StaticAnalyzer/Frontend/FrontendActions.cpp +++ b/lib/StaticAnalyzer/Frontend/FrontendActions.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "clang/StaticAnalyzer/Core/FrontendActions.h" +#include "clang/StaticAnalyzer/Frontend/FrontendActions.h" #include "clang/Frontend/CompilerInstance.h" #include "AnalysisConsumer.h" using namespace clang; |