diff --git a/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp b/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp index 791651fb6d6e0..aa91ff0cbfded 100644 --- a/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp +++ b/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp @@ -19,6 +19,11 @@ namespace google { namespace objc { void AvoidThrowingObjCExceptionCheck::registerMatchers(MatchFinder *Finder) { + // this check should only be applied to ObjC sources. + if (!getLangOpts().ObjC1 && !getLangOpts().ObjC2) { + return; + } + Finder->addMatcher(objcThrowStmt().bind("throwStmt"), this); Finder->addMatcher( objcMessageExpr(anyOf(hasSelector("raise:format:"), diff --git a/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp b/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp index d92414c1c1c0c..86c4656c1430c 100644 --- a/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp +++ b/clang-tools-extra/clang-tidy/objc/AvoidNSErrorInitCheck.cpp @@ -18,6 +18,10 @@ namespace tidy { namespace objc { void AvoidNSErrorInitCheck::registerMatchers(MatchFinder *Finder) { + // this check should only be applied to ObjC sources. + if (!getLangOpts().ObjC1 && !getLangOpts().ObjC2) { + return; + } Finder->addMatcher(objcMessageExpr(hasSelector("init"), hasReceiverType(asString("NSError *"))) .bind("nserrorInit"), diff --git a/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp b/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp index a8d79f5584498..e78cb995d32b3 100644 --- a/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp +++ b/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.cpp @@ -77,6 +77,10 @@ ForbiddenSubclassingCheck::ForbiddenSubclassingCheck( } void ForbiddenSubclassingCheck::registerMatchers(MatchFinder *Finder) { + // this check should only be applied to ObjC sources. + if (!getLangOpts().ObjC1 && !getLangOpts().ObjC2) { + return; + } Finder->addMatcher( objcInterfaceDecl( isSubclassOf( diff --git a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp index 700c5e63c09b0..7a3bbaf33539a 100644 --- a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp +++ b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp @@ -170,6 +170,10 @@ PropertyDeclarationCheck::PropertyDeclarationCheck(StringRef Name, EscapedAcronyms() {} void PropertyDeclarationCheck::registerMatchers(MatchFinder *Finder) { + // this check should only be applied to ObjC sources. + if (!getLangOpts().ObjC1 && !getLangOpts().ObjC2) { + return; + } if (IncludeDefaultAcronyms) { EscapedAcronyms.reserve(llvm::array_lengthof(DefaultSpecialAcronyms) + SpecialAcronyms.size());