Disable clang-tidy misc checkers when not compiling in C++ mode. Many of the checkers do not require additional testing as the tests will not compile for other languages or modes, or the checkers would never match a valid construct.

llvm-svn: 246318

1 files changed, 42 insertions, 30 deletions

diff --git a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
index 1b6b897..e5aa86e 100644
--- a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
@@ -27,34 +27,47 @@ StaticAssertCheck::StaticAssertCheck(StringRef Name, ClangTidyContext *Context)
     : ClangTidyCheck(Name, Context) {}
 
 void StaticAssertCheck::registerMatchers(MatchFinder *Finder) {
-  auto IsAlwaysFalse = expr(ignoringParenImpCasts(
-      expr(anyOf(boolLiteral(equals(false)), integerLiteral(equals(0)),
-          nullPtrLiteralExpr(), gnuNullExpr())).bind("isAlwaysFalse")));
-  auto IsAlwaysFalseWithCast = ignoringParenImpCasts(anyOf(IsAlwaysFalse,
-      cStyleCastExpr(has(IsAlwaysFalse)).bind("castExpr")));
-  auto AssertExprRoot = anyOf(
-      binaryOperator(
-          anyOf(hasOperatorName("&&"), hasOperatorName("==")),
-          hasEitherOperand(ignoringImpCasts(stringLiteral().bind("assertMSG"))),
-          anyOf(binaryOperator(hasEitherOperand(IsAlwaysFalseWithCast)),
-          anything())).bind("assertExprRoot"),
-      IsAlwaysFalse);
-  auto NonConstexprFunctionCall =
-      callExpr(hasDeclaration(functionDecl(unless(isConstexpr()))));
-  auto AssertCondition = expr(anyOf(
-      expr(ignoringParenCasts(anyOf(
-          AssertExprRoot,
-          unaryOperator(hasUnaryOperand(ignoringParenCasts(AssertExprRoot)))))),
-      anything()), unless(findAll(NonConstexprFunctionCall))).bind("condition");
-  auto Condition = anyOf(ignoringParenImpCasts(callExpr(
-      hasDeclaration(functionDecl(hasName("__builtin_expect"))),
-      hasArgument(0, AssertCondition))), AssertCondition);
-
-  Finder->addMatcher(
-      stmt(anyOf(conditionalOperator(hasCondition(Condition)),
-                 ifStmt(hasCondition(Condition))),
-           unless(isInTemplateInstantiation())).bind("condStmt"),
-      this);
+  // FIXME: I don't see why this checker couldn't also be interesting for
+  // _Static_assert in C11, or static_assert if <assert.h> has been included, 
+  // but it is currently only enabled for C++11. Investigate.
+  if (getLangOpts().CPlusPlus11) {
+    auto IsAlwaysFalse = expr(ignoringParenImpCasts(
+        expr(anyOf(boolLiteral(equals(false)), integerLiteral(equals(0)),
+                   nullPtrLiteralExpr(), gnuNullExpr()))
+            .bind("isAlwaysFalse")));
+    auto IsAlwaysFalseWithCast = ignoringParenImpCasts(anyOf(
+        IsAlwaysFalse, cStyleCastExpr(has(IsAlwaysFalse)).bind("castExpr")));
+    auto AssertExprRoot =
+        anyOf(binaryOperator(
+                  anyOf(hasOperatorName("&&"), hasOperatorName("==")),
+                  hasEitherOperand(
+                      ignoringImpCasts(stringLiteral().bind("assertMSG"))),
+                  anyOf(binaryOperator(hasEitherOperand(IsAlwaysFalseWithCast)),
+                        anything()))
+                  .bind("assertExprRoot"),
+              IsAlwaysFalse);
+    auto NonConstexprFunctionCall =
+        callExpr(hasDeclaration(functionDecl(unless(isConstexpr()))));
+    auto AssertCondition =
+        expr(anyOf(expr(ignoringParenCasts(
+                       anyOf(AssertExprRoot,
+                             unaryOperator(hasUnaryOperand(
+                                 ignoringParenCasts(AssertExprRoot)))))),
+                   anything()),
+             unless(findAll(NonConstexprFunctionCall)))
+            .bind("condition");
+    auto Condition =
+        anyOf(ignoringParenImpCasts(callExpr(
+                  hasDeclaration(functionDecl(hasName("__builtin_expect"))),
+                  hasArgument(0, AssertCondition))),
+              AssertCondition);
+
+    Finder->addMatcher(stmt(anyOf(conditionalOperator(hasCondition(Condition)),
+                                  ifStmt(hasCondition(Condition))),
+                            unless(isInTemplateInstantiation()))
+                           .bind("condStmt"),
+                       this);
+  }
 }
 
 void StaticAssertCheck::check(const MatchFinder::MatchResult &Result) {
@@ -70,8 +83,7 @@ void StaticAssertCheck::check(const MatchFinder::MatchResult &Result) {
   const auto *CastExpr = Result.Nodes.getNodeAs<CStyleCastExpr>("castExpr");
   SourceLocation AssertExpansionLoc = CondStmt->getLocStart();
 
-  if (!Opts.CPlusPlus11 || !AssertExpansionLoc.isValid() ||
-      !AssertExpansionLoc.isMacroID())
+  if (!AssertExpansionLoc.isValid() || !AssertExpansionLoc.isMacroID())
     return;
 
   StringRef MacroName =