commit c6ba6fc3c89d249ab9782b5f65608e8742896caf
author Alexander Kornienko <alexfh@google.com> Thu May 04 16:06:08 2017 +0000
committer Alexander Kornienko <alexfh@google.com> Thu May 04 16:06:08 2017 +0000
tree dc2e85021c498c2afd8e4540c6df5b6e1b2fc7e1
parent 704c03e03b16ec84b1be0134927495e0d0fe2493

[clang-tidy] fix readability-implicit-bool-cast false positive with xor

llvm-svn: 302164

clang-tools-extra/clang-tidy/readability/ImplicitBoolCastCheck.cpp

diff --git a/clang-tools-extra/clang-tidy/readability/ImplicitBoolCastCheck.cpp b/clang-tools-extra/clang-tidy/readability/ImplicitBoolCastCheck.cpp
index a7e4f0c..13b410b 100644
--- a/clang-tools-extra/clang-tidy/readability/ImplicitBoolCastCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/ImplicitBoolCastCheck.cpp
@@ -270,11 +270,22 @@
       anyOf(hasParent(explicitCastExpr()),
             allOf(isMacroExpansion(), unless(isNULLMacroExpansion())),
             isInTemplateInstantiation(), hasAncestor(functionTemplateDecl())));
-
+  auto implicitCastFromBool = implicitCastExpr(
+      unless(exceptionCases),
+      anyOf(hasCastKind(CK_IntegralCast), hasCastKind(CK_IntegralToFloating),
+            // Prior to C++11 cast from bool literal to pointer was allowed.
+            allOf(anyOf(hasCastKind(CK_NullToPointer),
+                        hasCastKind(CK_NullToMemberPointer)),
+                  hasSourceExpression(cxxBoolLiteral()))),
+      hasSourceExpression(expr(hasType(booleanType()))));
+  auto boolXor =
+      binaryOperator(hasOperatorName("^"), hasLHS(implicitCastFromBool),
+                     hasRHS(implicitCastFromBool));
   Finder->addMatcher(
       implicitCastExpr(
           // Exclude cases common to implicit cast to and from bool.
           unless(exceptionCases),
+          unless(has(boolXor)),
           // Exclude case of using if or while statements with variable
           // declaration, e.g.:
           //   if (int var = functionCall()) {}
@@ -290,21 +301,12 @@
           .bind("implicitCastToBool"),
       this);
 
-  auto implicitCastFromBool = implicitCastExpr(
-      unless(exceptionCases),
-      anyOf(hasCastKind(CK_IntegralCast), hasCastKind(CK_IntegralToFloating),
-            // Prior to C++11 cast from bool literal to pointer was allowed.
-            allOf(anyOf(hasCastKind(CK_NullToPointer),
-                        hasCastKind(CK_NullToMemberPointer)),
-                  hasSourceExpression(cxxBoolLiteral()))),
-      hasSourceExpression(expr(hasType(booleanType()))));
-
   auto boolComparison = binaryOperator(
       anyOf(hasOperatorName("=="), hasOperatorName("!=")),
       hasLHS(implicitCastFromBool), hasRHS(implicitCastFromBool));
-  auto boolOpAssignment = binaryOperator(
-      anyOf(hasOperatorName("|="), hasOperatorName("&=")),
-      hasLHS(expr(hasType(booleanType()))), hasRHS(implicitCastFromBool));
+  auto boolOpAssignment =
+      binaryOperator(anyOf(hasOperatorName("|="), hasOperatorName("&=")),
+                     hasLHS(expr(hasType(booleanType()))));
   Finder->addMatcher(
       implicitCastExpr(
           implicitCastFromBool,
@@ -312,8 +314,8 @@
           // in such context:
           //   bool_expr_a == bool_expr_b
           //   bool_expr_a != bool_expr_b
-          unless(hasParent(
-              binaryOperator(anyOf(boolComparison, boolOpAssignment)))),
+          unless(hasParent(binaryOperator(
+              anyOf(boolComparison, boolXor, boolOpAssignment)))),
           // Check also for nested casts, for example: bool -> int -> float.
           anyOf(hasParent(implicitCastExpr().bind("furtherImplicitCast")),
                 anything()))