njames93 created this revision.
njames93 added reviewers: aaron.ballman, gribozavr2, Eugene.Zelenko, JonasToth,
alexfh, hokein.
Herald added subscribers: cfe-commits, usaxena95, kadircet, arphaman, jkorous,
xazax.hun.
Herald added a project: clang.
Motivated by Tune inspections to a specific C++ standard.
<https://bugs.llvm.org/show_bug.cgi?id=45045>
Moves the isLanguageVersionSupported virtual function from `MakeSmartPtrCheck`
to the base `ClangTidyCheck` class.
This will disable registering matchers or pp callbacks on unsupported language
versions for a check.
Having it as a standalone function is cleaner than manually disabling the check
in the register function and should hopefully
encourage check developers to actually restrict the check based on language
version.
As an added bonus this could enable automatic detection of what language
version a check runs on for the purpose of documentation generation
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D75289
Files:
clang-tools-extra/clang-tidy/ClangTidy.cpp
clang-tools-extra/clang-tidy/ClangTidyCheck.h
clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
clang-tools-extra/clangd/ParsedAST.cpp
clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
Index: clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
===================================================================
--- clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
+++ clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
@@ -67,6 +67,8 @@
// `getLangOpts()`).
CheckFactory<CheckTypes...>::createChecks(&Context, Checks);
for (auto &Check : Checks) {
+ if (!Check->isLanguageVersionSupported(Context.getLangOpts()))
+ continue;
Check->registerMatchers(&Finder);
Check->registerPPCallbacks(Compiler.getSourceManager(), PP, PP);
}
Index: clang-tools-extra/clangd/ParsedAST.cpp
===================================================================
--- clang-tools-extra/clangd/ParsedAST.cpp
+++ clang-tools-extra/clangd/ParsedAST.cpp
@@ -301,6 +301,8 @@
});
Preprocessor *PP = &Clang->getPreprocessor();
for (const auto &Check : CTChecks) {
+ if (!Check->isLanguageVersionSupported(CTContext->getLangOpts()))
+ continue;
// FIXME: the PP callbacks skip the entire preamble.
// Checks that want to see #includes in the main file do not see them.
Check->registerPPCallbacks(Clang->getSourceManager(), PP, PP);
Index: clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
+++ clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
@@ -41,7 +41,7 @@
virtual SmartPtrTypeMatcher getSmartPointerTypeMatcher() const = 0;
/// Returns whether the C++ version is compatible with current check.
- virtual bool isLanguageVersionSupported(const LangOptions &LangOpts) const;
+ bool isLanguageVersionSupported(const LangOptions &LangOpts) const override;
static const char PointerType[];
Index: clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
@@ -68,17 +68,12 @@
void MakeSmartPtrCheck::registerPPCallbacks(const SourceManager &SM,
Preprocessor *PP,
Preprocessor *ModuleExpanderPP) {
- if (isLanguageVersionSupported(getLangOpts())) {
Inserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
IncludeStyle);
PP->addPPCallbacks(Inserter->CreatePPCallbacks());
- }
}
void MakeSmartPtrCheck::registerMatchers(ast_matchers::MatchFinder *Finder) {
- if (!isLanguageVersionSupported(getLangOpts()))
- return;
-
// Calling make_smart_ptr from within a member function of a type with a
// private or protected constructor would be ill-formed.
auto CanCallCtor = unless(has(ignoringImpCasts(
Index: clang-tools-extra/clang-tidy/ClangTidyCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/ClangTidyCheck.h
+++ clang-tools-extra/clang-tidy/ClangTidyCheck.h
@@ -100,6 +100,16 @@
/// whether it has the default value or it has been overridden.
virtual void storeOptions(ClangTidyOptions::OptionMap &Options) {}
+ /// Override this to disable registering matchers and PP callbacks if an
+ /// invalid language version is being used.
+ ///
+ /// For example if a check is examining overloaded functions then this should
+ /// be overridden to return false when the CPlusPlus flag is not set in
+ /// \p LangOpts.
+ virtual bool isLanguageVersionSupported(const LangOptions &LangOpts) const {
+ return true;
+ }
+
/// Provides access to the ``ClangTidyCheck`` options via check-local
/// names.
///
Index: clang-tools-extra/clang-tidy/ClangTidy.cpp
===================================================================
--- clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -409,6 +409,8 @@
}
for (auto &Check : Checks) {
+ if (!Check->isLanguageVersionSupported(Context.getLangOpts()))
+ continue;
Check->registerMatchers(&*Finder);
Check->registerPPCallbacks(*SM, PP, ModuleExpanderPP);
}
Index: clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
===================================================================
--- clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
+++ clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h
@@ -67,6 +67,8 @@
// `getLangOpts()`).
CheckFactory<CheckTypes...>::createChecks(&Context, Checks);
for (auto &Check : Checks) {
+ if (!Check->isLanguageVersionSupported(Context.getLangOpts()))
+ continue;
Check->registerMatchers(&Finder);
Check->registerPPCallbacks(Compiler.getSourceManager(), PP, PP);
}
Index: clang-tools-extra/clangd/ParsedAST.cpp
===================================================================
--- clang-tools-extra/clangd/ParsedAST.cpp
+++ clang-tools-extra/clangd/ParsedAST.cpp
@@ -301,6 +301,8 @@
});
Preprocessor *PP = &Clang->getPreprocessor();
for (const auto &Check : CTChecks) {
+ if (!Check->isLanguageVersionSupported(CTContext->getLangOpts()))
+ continue;
// FIXME: the PP callbacks skip the entire preamble.
// Checks that want to see #includes in the main file do not see them.
Check->registerPPCallbacks(Clang->getSourceManager(), PP, PP);
Index: clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
+++ clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
@@ -41,7 +41,7 @@
virtual SmartPtrTypeMatcher getSmartPointerTypeMatcher() const = 0;
/// Returns whether the C++ version is compatible with current check.
- virtual bool isLanguageVersionSupported(const LangOptions &LangOpts) const;
+ bool isLanguageVersionSupported(const LangOptions &LangOpts) const override;
static const char PointerType[];
Index: clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp
@@ -68,17 +68,12 @@
void MakeSmartPtrCheck::registerPPCallbacks(const SourceManager &SM,
Preprocessor *PP,
Preprocessor *ModuleExpanderPP) {
- if (isLanguageVersionSupported(getLangOpts())) {
Inserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
IncludeStyle);
PP->addPPCallbacks(Inserter->CreatePPCallbacks());
- }
}
void MakeSmartPtrCheck::registerMatchers(ast_matchers::MatchFinder *Finder) {
- if (!isLanguageVersionSupported(getLangOpts()))
- return;
-
// Calling make_smart_ptr from within a member function of a type with a
// private or protected constructor would be ill-formed.
auto CanCallCtor = unless(has(ignoringImpCasts(
Index: clang-tools-extra/clang-tidy/ClangTidyCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/ClangTidyCheck.h
+++ clang-tools-extra/clang-tidy/ClangTidyCheck.h
@@ -100,6 +100,16 @@
/// whether it has the default value or it has been overridden.
virtual void storeOptions(ClangTidyOptions::OptionMap &Options) {}
+ /// Override this to disable registering matchers and PP callbacks if an
+ /// invalid language version is being used.
+ ///
+ /// For example if a check is examining overloaded functions then this should
+ /// be overridden to return false when the CPlusPlus flag is not set in
+ /// \p LangOpts.
+ virtual bool isLanguageVersionSupported(const LangOptions &LangOpts) const {
+ return true;
+ }
+
/// Provides access to the ``ClangTidyCheck`` options via check-local
/// names.
///
Index: clang-tools-extra/clang-tidy/ClangTidy.cpp
===================================================================
--- clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -409,6 +409,8 @@
}
for (auto &Check : Checks) {
+ if (!Check->isLanguageVersionSupported(Context.getLangOpts()))
+ continue;
Check->registerMatchers(&*Finder);
Check->registerPPCallbacks(*SM, PP, ModuleExpanderPP);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
