Fix flags case

Author: denzor200

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

@@ -74,24 +74,6 @@ static llvm::StringRef translate(llvm::StringRef Value) {
   return {};
 }
 
-static bool isBooleanBitwise(const BinaryOperator *BinOp, ASTContext *AC,
-                             std::optional<bool> &RootAssignsToBoolean);
-
-static bool recheckIsBooleanDeeply(const BinaryOperator *BinOp, ASTContext *AC,
-                                   bool &IsBooleanLHS, bool &IsBooleanRHS) {
-  std::optional<bool> DummyFlag = false;
-  IsBooleanLHS = IsBooleanLHS ||
-                 isBooleanBitwise(dyn_cast<BinaryOperator>(
-                                      BinOp->getLHS()->IgnoreParenImpCasts()),
-                                  AC, DummyFlag);
-  IsBooleanRHS = IsBooleanRHS ||
-                 isBooleanBitwise(dyn_cast<BinaryOperator>(
-                                      BinOp->getRHS()->IgnoreParenImpCasts()),
-                                  AC, DummyFlag);
-  return true; // just a formal bool for possibility to be invoked from
-               // expression
-}
-
 static bool isBooleanBitwise(const BinaryOperator *BinOp, ASTContext *AC,
                              std::optional<bool> &RootAssignsToBoolean) {
   if (!BinOp)
@@ -109,22 +91,35 @@ static bool isBooleanBitwise(const BinaryOperator *BinOp, ASTContext *AC,
                               ->getType()
                               .getDesugaredType(*AC)
                               ->isBooleanType();
-      for (int i = 0; i < 2;
-           !i++ &&
-           recheckIsBooleanDeeply(BinOp, AC, IsBooleanLHS, IsBooleanRHS)) {
-        if (IsBooleanLHS && IsBooleanRHS) {
-          RootAssignsToBoolean = RootAssignsToBoolean.value_or(false);
-          return true;
-        }
-        if (assignsToBoolean(BinOp, AC) ||
-            RootAssignsToBoolean.value_or(false)) {
-          RootAssignsToBoolean = RootAssignsToBoolean.value_or(true);
-          return true;
-        }
-        if (BinOp->isCompoundAssignmentOp() && IsBooleanLHS) {
-          RootAssignsToBoolean = RootAssignsToBoolean.value_or(true);
-          return true;
-        }
+      if (IsBooleanLHS && IsBooleanRHS) {
+        RootAssignsToBoolean = RootAssignsToBoolean.value_or(false);
+        return true;
+      }
+      if (((IsBooleanLHS || IsBooleanRHS) && assignsToBoolean(BinOp, AC)) ||
+          RootAssignsToBoolean.value_or(false)) {
+        RootAssignsToBoolean = RootAssignsToBoolean.value_or(true);
+        return true;
+      }
+      if (BinOp->isCompoundAssignmentOp() && IsBooleanLHS) {
+        RootAssignsToBoolean = RootAssignsToBoolean.value_or(true);
+        return true;
+      }
+
+      std::optional<bool> DummyFlag = false;
+      IsBooleanLHS =
+          IsBooleanLHS ||
+          isBooleanBitwise(
+              dyn_cast<BinaryOperator>(BinOp->getLHS()->IgnoreParenImpCasts()),
+              AC, DummyFlag);
+      IsBooleanRHS =
+          IsBooleanRHS ||
+          isBooleanBitwise(
+              dyn_cast<BinaryOperator>(BinOp->getRHS()->IgnoreParenImpCasts()),
+              AC, DummyFlag);
+
+      if (IsBooleanLHS && IsBooleanRHS) {
+        RootAssignsToBoolean = RootAssignsToBoolean.value_or(false);
+        return true;
       }
     }
   }

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

@@ -0,0 +1,9 @@
+// RUN: %check_clang_tidy %s misc-bool-bitwise-operation %t
+
+bool normal() {
+    unsigned flags = 100;
+    if (flags & 0xFFFFFFF8) {
+
+    }
+    return flags & 0x20;
+}