Author: szelethus Date: Fri Apr 19 04:01:35 2019 New Revision: 358750 URL: http://llvm.org/viewvc/llvm-project?rev=358750&view=rev Log: [analyzer] Fix an assertion failure if plugins added dependencies
Ideally, there is no reason behind not being able to depend on checkers that come from a different plugin (or on builtin checkers) -- however, this is only possible if all checkers are added to the registry before resolving checker dependencies. Since I used a binary search in my addDependency method, this also resulted in an assertion failure (due to CheckerRegistry::Checkers not being sorted), since the function used by plugins to register their checkers (clang_registerCheckers) calls addDependency. This patch resolves this issue by only noting which dependencies have to established when addDependency is called, and resolves them at a later stage when no more checkers are added to the registry, by which point CheckerRegistry::Checkers is already sorted. Differential Revision: https://reviews.llvm.org/D59461 Modified: cfe/trunk/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h cfe/trunk/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp cfe/trunk/test/Analysis/checker-dependencies.c Modified: cfe/trunk/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h?rev=358750&r1=358749&r2=358750&view=diff ============================================================================== --- cfe/trunk/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h (original) +++ cfe/trunk/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h Fri Apr 19 04:01:35 2019 @@ -195,6 +195,12 @@ private: CheckerInfoList Checkers; llvm::StringMap<size_t> PackageSizes; + /// Contains all (Dependendent checker, Dependency) pairs. We need this, as + /// we'll resolve dependencies after all checkers were added first. + llvm::SmallVector<std::pair<StringRef, StringRef>, 0> Dependencies; + + void resolveDependencies(); + DiagnosticsEngine &Diags; AnalyzerOptions &AnOpts; const LangOptions &LangOpts; Modified: cfe/trunk/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp?rev=358750&r1=358749&r2=358750&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp Fri Apr 19 04:01:35 2019 @@ -177,6 +177,8 @@ CheckerRegistry::CheckerRegistry( #undef CHECKER_DEPENDENCY #undef GET_CHECKER_DEPENDENCIES + resolveDependencies(); + // Parse '-analyzer-checker' and '-analyzer-disable-checker' options from the // command line. for (const std::pair<std::string, bool> &Opt : AnOpts.CheckersControlList) { @@ -278,18 +280,26 @@ void CheckerRegistry::addChecker(Initial } } -void CheckerRegistry::addDependency(StringRef FullName, StringRef Dependency) { - auto CheckerIt = binaryFind(Checkers, FullName); - assert(CheckerIt != Checkers.end() && CheckerIt->FullName == FullName && - "Failed to find the checker while attempting to set up its " - "dependencies!"); - - auto DependencyIt = binaryFind(Checkers, Dependency); - assert(DependencyIt != Checkers.end() && - DependencyIt->FullName == Dependency && - "Failed to find the dependency of a checker!"); +void CheckerRegistry::resolveDependencies() { + for (const std::pair<StringRef, StringRef> &Entry : Dependencies) { + auto CheckerIt = binaryFind(Checkers, Entry.first); + assert(CheckerIt != Checkers.end() && CheckerIt->FullName == Entry.first && + "Failed to find the checker while attempting to set up its " + "dependencies!"); + + auto DependencyIt = binaryFind(Checkers, Entry.second); + assert(DependencyIt != Checkers.end() && + DependencyIt->FullName == Entry.second && + "Failed to find the dependency of a checker!"); + + CheckerIt->Dependencies.emplace_back(&*DependencyIt); + } - CheckerIt->Dependencies.emplace_back(&*DependencyIt); + Dependencies.clear(); +} + +void CheckerRegistry::addDependency(StringRef FullName, StringRef Dependency) { + Dependencies.emplace_back(FullName, Dependency); } void CheckerRegistry::initializeManager(CheckerManager &CheckerMgr) const { Modified: cfe/trunk/test/Analysis/checker-dependencies.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/checker-dependencies.c?rev=358750&r1=358749&r2=358750&view=diff ============================================================================== --- cfe/trunk/test/Analysis/checker-dependencies.c (original) +++ cfe/trunk/test/Analysis/checker-dependencies.c Fri Apr 19 04:01:35 2019 @@ -1,3 +1,20 @@ // RUN: %clang_analyze_cc1 %s \ // RUN: -analyzer-checker=core \ // RUN: -analyzer-checker=nullability.NullReturnedFromNonnull + +// RUN: %clang_analyze_cc1 %s \ +// RUN: -analyzer-checker=osx.cocoa.RetainCount \ +// RUN: -analyzer-list-enabled-checkers \ +// RUN: 2>&1 | FileCheck %s -check-prefix=CHECK-IMPLICITLY-ENABLED + +// CHECK-IMPLICITLY-ENABLED: osx.cocoa.RetainCountBase +// CHECK-IMPLICITLY-ENABLED: osx.cocoa.RetainCount + +// RUN: %clang_analyze_cc1 %s \ +// RUN: -analyzer-checker=osx.cocoa.RetainCount \ +// RUN: -analyzer-disable-checker=osx.cocoa.RetainCountBase \ +// RUN: -analyzer-list-enabled-checkers \ +// RUN: 2>&1 | FileCheck %s -check-prefix=CHECK-IMPLICITLY-DISABLED + +// CHECK-IMPLICITLY-DISABLED-NOT: osx.cocoa.RetainCountBase +// CHECK-IMPLICITLY-DISABLED-NOT: osx.cocoa.RetainCount _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
