fix the problem with hasAncestor

Author: denzor200

clang-tools-extra/clang-tidy/performance/BoolBitwiseOperationCheck.cpp

@@ -167,7 +167,12 @@ void BoolBitwiseOperationCheck::check(const MatchFinder::MatchResult &Result) {
   ReplaceOperator = FixItHint::CreateReplacement(TokenRange, FixSpelling);
 
   std::optional<BinaryOperatorKind> ParentOpcode;
-  if (const auto *Parent = Result.Nodes.getNodeAs<BinaryOperator>("p"); Parent)
+  if (const auto *Parent = Result.Nodes.getNodeAs<BinaryOperator>("p");
+      Parent && llvm::any_of(std::array{Parent->getLHS(), Parent->getRHS()},
+                             [&](const Expr *E) {
+                               return dyn_cast<BinaryOperator>(
+                                          E->IgnoreImpCasts()) == MatchedExpr;
+                             }))
     ParentOpcode = Parent->getOpcode();
 
   const auto *RHS =

clang-tools-extra/test/clang-tidy/checkers/performance/bool-bitwise-operation-nontraditional.cpp

@@ -186,12 +186,27 @@ void bad_with_priors2() {
     // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
     // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: use logical operator '||' for boolean values instead of bitwise operator '|' [performance-bool-bitwise-operation]
     // CHECK-FIXES: (b and c) or a;
+}
+
+template<typename T>
+T ident(T val) { return val; }
 
-    // case to check `hasAncestor` works as we expected:
+// cases to check `hasAncestor` works as we expected:
+void bad_has_ancestor() {
+    bool a = false, b = true, c = true;
     bool d = false;
     d xor (a and b bitand c);
     // CHECK-MESSAGES: :[[@LINE-1]]:20: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
     // CHECK-FIXES: d xor (a and b and c);
+
+    a xor ident(b bitand c or a);
+    // CHECK-MESSAGES: :[[@LINE-1]]:19: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
+    // CHECK-FIXES: a xor ident(b and c or a);
+
+    a bitor ident(a ? b bitand c : c);
+    // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use logical operator '||' for boolean values instead of bitwise operator '|' [performance-bool-bitwise-operation]
+    // CHECK-MESSAGES: :[[@LINE-2]]:25: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
+    // CHECK-FIXES: a bitor ident(a ? b and c : c);
 }
 
 void bad_with_priors_already_braced() {

clang-tools-extra/test/clang-tidy/checkers/performance/bool-bitwise-operation.cpp

@@ -186,12 +186,27 @@ void bad_with_priors2() {
     // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
     // CHECK-MESSAGES: :[[@LINE-2]]:11: warning: use logical operator '||' for boolean values instead of bitwise operator '|' [performance-bool-bitwise-operation]
     // CHECK-FIXES: (b && c) || a;
+}
+
+template<typename T>
+T ident(T val) { return val; }
 
-    // case to check `hasAncestor` works as we expected:
+// cases to check `hasAncestor` works as we expected:
+void bad_has_ancestor() {
+    bool a = false, b = true, c = true;
     bool d = false;
     d ^ (a && b & c);
     // CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
     // CHECK-FIXES: d ^ (a && b && c);
+
+    a ^ ident(b & c || a);
+    // CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
+    // CHECK-FIXES: a ^ ident(b && c || a);
+
+    a | ident(a ? b & c : c);
+    // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use logical operator '||' for boolean values instead of bitwise operator '|' [performance-bool-bitwise-operation]
+    // CHECK-MESSAGES: :[[@LINE-2]]:21: warning: use logical operator '&&' for boolean values instead of bitwise operator '&' [performance-bool-bitwise-operation]
+    // CHECK-FIXES: a | ident(a ? b && c : c);
 }
 
 void bad_with_priors_already_braced() {