Index: clang-tools-extra/trunk/clang-tidy/ClangTidy.h =================================================================== --- clang-tools-extra/trunk/clang-tidy/ClangTidy.h +++ clang-tools-extra/trunk/clang-tidy/ClangTidy.h @@ -210,7 +210,8 @@ /// \brief Fills the list of check names that are enabled when the provided /// filters are applied. -std::vector getCheckNames(const ClangTidyOptions &Options); +std::vector getCheckNames(const ClangTidyOptions &Options, + bool AllowEnablingAnalyzerAlphaCheckers); /// \brief Returns the effective check-specific options. /// @@ -218,7 +219,9 @@ /// effective options from all created checks. The returned set of options /// includes default check-specific options for all keys not overridden by \p /// Options. -ClangTidyOptions::OptionMap getCheckOptions(const ClangTidyOptions &Options); +ClangTidyOptions::OptionMap +getCheckOptions(const ClangTidyOptions &Options, + bool AllowEnablingAnalyzerAlphaCheckers); /// \brief Run a set of clang-tidy checks on a set of files. /// Index: clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp +++ clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp @@ -309,11 +309,12 @@ typedef std::vector> CheckersList; -static CheckersList getCheckersControlList(ClangTidyContext &Context) { +static CheckersList getCheckersControlList(ClangTidyContext &Context, + bool IncludeExperimental) { CheckersList List; const auto &RegisteredCheckers = - AnalyzerOptions::getRegisteredCheckers(/*IncludeExperimental=*/false); + AnalyzerOptions::getRegisteredCheckers(IncludeExperimental); bool AnalyzerChecksEnabled = false; for (StringRef CheckName : RegisteredCheckers) { std::string ClangTidyCheckName((AnalyzerCheckNamePrefix + CheckName).str()); @@ -379,7 +380,8 @@ Consumers.push_back(Finder->newASTConsumer()); AnalyzerOptionsRef AnalyzerOptions = Compiler.getAnalyzerOpts(); - AnalyzerOptions->CheckersControlList = getCheckersControlList(Context); + AnalyzerOptions->CheckersControlList = + getCheckersControlList(Context, Context.canEnableAnalyzerAlphaCheckers()); if (!AnalyzerOptions->CheckersControlList.empty()) { setStaticAnalyzerCheckerOpts(Context.getOptions(), AnalyzerOptions); AnalyzerOptions->AnalysisStoreOpt = RegionStoreModel; @@ -404,7 +406,8 @@ CheckNames.push_back(CheckFactory.first); } - for (const auto &AnalyzerCheck : getCheckersControlList(Context)) + for (const auto &AnalyzerCheck : getCheckersControlList( + Context, Context.canEnableAnalyzerAlphaCheckers())) CheckNames.push_back(AnalyzerCheckNamePrefix + AnalyzerCheck.first); std::sort(CheckNames.begin(), CheckNames.end()); @@ -463,18 +466,24 @@ store(Options, LocalName, llvm::itostr(Value)); } -std::vector getCheckNames(const ClangTidyOptions &Options) { +std::vector +getCheckNames(const ClangTidyOptions &Options, + bool AllowEnablingAnalyzerAlphaCheckers) { clang::tidy::ClangTidyContext Context( llvm::make_unique(ClangTidyGlobalOptions(), - Options)); + Options), + AllowEnablingAnalyzerAlphaCheckers); ClangTidyASTConsumerFactory Factory(Context); return Factory.getCheckNames(); } -ClangTidyOptions::OptionMap getCheckOptions(const ClangTidyOptions &Options) { +ClangTidyOptions::OptionMap +getCheckOptions(const ClangTidyOptions &Options, + bool AllowEnablingAnalyzerAlphaCheckers) { clang::tidy::ClangTidyContext Context( llvm::make_unique(ClangTidyGlobalOptions(), - Options)); + Options), + AllowEnablingAnalyzerAlphaCheckers); ClangTidyASTConsumerFactory Factory(Context); return Factory.getCheckOptions(); } Index: clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h =================================================================== --- clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h +++ clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -99,7 +99,8 @@ class ClangTidyContext { public: /// \brief Initializes \c ClangTidyContext instance. - ClangTidyContext(std::unique_ptr OptionsProvider); + ClangTidyContext(std::unique_ptr OptionsProvider, + bool AllowEnablingAnalyzerAlphaCheckers = false); ~ClangTidyContext(); @@ -178,6 +179,12 @@ return CurrentBuildDirectory; } + /// \brief If the experimental alpha checkers from the static analyzer can be + /// enabled. + bool canEnableAnalyzerAlphaCheckers() const { + return AllowEnablingAnalyzerAlphaCheckers; + } + private: // Calls setDiagnosticsEngine() and storeError(). friend class ClangTidyDiagnosticConsumer; @@ -209,6 +216,8 @@ llvm::DenseMap CheckNamesByDiagnosticID; bool Profile; + + bool AllowEnablingAnalyzerAlphaCheckers; }; /// \brief A diagnostic consumer that turns each \c Diagnostic into a Index: clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -177,9 +177,11 @@ }; ClangTidyContext::ClangTidyContext( - std::unique_ptr OptionsProvider) + std::unique_ptr OptionsProvider, + bool AllowEnablingAnalyzerAlphaCheckers) : DiagEngine(nullptr), OptionsProvider(std::move(OptionsProvider)), - Profile(false) { + Profile(false), + AllowEnablingAnalyzerAlphaCheckers(AllowEnablingAnalyzerAlphaCheckers) { // Before the first translation unit we can get errors related to command-line // parsing, use empty string for the file name in this case. setCurrentFile(""); Index: clang-tools-extra/trunk/clang-tidy/tool/ClangTidyMain.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/tool/ClangTidyMain.cpp +++ clang-tools-extra/trunk/clang-tidy/tool/ClangTidyMain.cpp @@ -181,6 +181,14 @@ cl::init(false), cl::cat(ClangTidyCategory)); +/// This option allows enabling the experimental alpha checkers from the static +/// analyzer. This option is set to false and not visible in help, because it is +/// highly not recommended for users. +static cl::opt + AllowEnablingAnalyzerAlphaCheckers("allow-enabling-analyzer-alpha-checkers", + cl::init(false), cl::Hidden, + cl::cat(ClangTidyCategory)); + static cl::opt ExportFixes("export-fixes", cl::desc(R"( YAML file to store suggested fixes in. The stored fixes can be applied to the input source @@ -335,7 +343,8 @@ << EC.message() << "\n"; } ClangTidyOptions EffectiveOptions = OptionsProvider->getOptions(FilePath); - std::vector EnabledChecks = getCheckNames(EffectiveOptions); + std::vector EnabledChecks = + getCheckNames(EffectiveOptions, AllowEnablingAnalyzerAlphaCheckers); if (ExplainConfig) { // FIXME: Show other ClangTidyOptions' fields, like ExtraArg. @@ -366,7 +375,8 @@ } if (DumpConfig) { - EffectiveOptions.CheckOptions = getCheckOptions(EffectiveOptions); + EffectiveOptions.CheckOptions = + getCheckOptions(EffectiveOptions, AllowEnablingAnalyzerAlphaCheckers); llvm::outs() << configurationAsText( ClangTidyOptions::getDefaults().mergeWith( EffectiveOptions)) @@ -390,7 +400,8 @@ llvm::InitializeAllTargetMCs(); llvm::InitializeAllAsmParsers(); - ClangTidyContext Context(std::move(OwningOptionsProvider)); + ClangTidyContext Context(std::move(OwningOptionsProvider), + AllowEnablingAnalyzerAlphaCheckers); runClangTidy(Context, OptionsParser.getCompilations(), PathList, BaseFS, EnableCheckProfile); ArrayRef Errors = Context.getErrors(); Index: clang-tools-extra/trunk/test/clang-tidy/enable-alpha-checks.cpp =================================================================== --- clang-tools-extra/trunk/test/clang-tidy/enable-alpha-checks.cpp +++ clang-tools-extra/trunk/test/clang-tidy/enable-alpha-checks.cpp @@ -0,0 +1,6 @@ +// Check if '-allow-enabling-analyzer-alpha-checkers' is visible for users. +// RUN: clang-tidy -help | not grep 'allow-enabling-analyzer-alpha-checkers' + +// Check if '-allow-enabling-analyzer-alpha-checkers' enables alpha checks. +// RUN: clang-tidy -checks=* -list-checks | not grep 'clang-analyzer-alpha' +// RUN: clang-tidy -checks=* -list-checks -allow-enabling-analyzer-alpha-checkers | grep 'clang-analyzer-alpha'