[clang-tools-extra] [clang-tidy] Fix false negative for binary logical expressions for tw… (PR #230846)

[Abhay Singh via cfe-commits]

https://github.com/Abhay13332 updated https://github.com/llvm/llvm-project/pull/230846

>From 8854364e5e9a1c2e2620ea4fe33fca7d8d519b79 Mon Sep 17 00:00:00 2001
From: abhay13332 <abhaysingh13072009 at gmail.com>
Date: Sun, 11 Oct 2026 01:09:35 +0530
Subject: [PATCH 1/3] [clang-tidy] Fix false negative for binary logical
 expressions for two operands in bugprone-redundant-branch-condition

---
 .../bugprone/RedundantBranchConditionCheck.cpp    |  7 +++----
 clang-tools-extra/docs/ReleaseNotes.md            |  6 ++++++
 .../bugprone/redundant-branch-condition.cpp       | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/bugprone/RedundantBranchConditionCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/RedundantBranchConditionCheck.cpp
index 8d608dd4b0e66..f6c6373969b34 100644
--- a/clang-tools-extra/clang-tidy/bugprone/RedundantBranchConditionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/RedundantBranchConditionCheck.cpp
@@ -76,10 +76,9 @@ void RedundantBranchConditionCheck::registerMatchers(MatchFinder *Finder) {
       ifStmt(
           hasCondition(anyOf(
               declRefExpr(hasDeclaration(ImmutableVar)).bind(OuterIfVar1Str),
-              binaryOperator(
-                  hasOperatorName("&&"),
-                  hasEitherOperand(declRefExpr(hasDeclaration(ImmutableVar))
-                                       .bind(OuterIfVar2Str))))),
+              binaryOperator(hasOperatorName("&&"),
+                             forEach((declRefExpr(hasDeclaration(ImmutableVar))
+                                          .bind(OuterIfVar2Str)))))),
           hasThen(hasDescendant(
               ifStmt(hasCondition(anyOf(
                          declRefExpr(hasDeclaration(
diff --git a/clang-tools-extra/docs/ReleaseNotes.md b/clang-tools-extra/docs/ReleaseNotes.md
index 42451c4590592..8a6cb3964c4fd 100644
--- a/clang-tools-extra/docs/ReleaseNotes.md
+++ b/clang-tools-extra/docs/ReleaseNotes.md
@@ -198,6 +198,11 @@ infrastructure are described first, followed by tool-specific sections.
   <clang-tidy/checks/bugprone/std-namespace-modification>` when checking
   lambda closure types used as template arguments.
 
+- Improved {doc}`bugprone-redundant-branch-condition
+  <clang-tidy/checks/bugprone/redundant-branch-condition>` check fix for 
+  false negative when there are two declaration statement in if with && 
+  it skips the second one bind with first one only preveiously.
+
 - Improved {doc}`cppcoreguidelines-missing-std-forward
   <clang-tidy/checks/cppcoreguidelines/missing-std-forward>` check by diagnosing
   unforwarded `auto&&` parameters in C++20 abbreviated function templates.
@@ -352,6 +357,7 @@ infrastructure are described first, followed by tool-specific sections.
   <clang-tidy/checks/readability/use-std-min-max>` check by fixing spurious
   trailing semicolons and lost comments when the `if` body has no braces.
 
+
 #### Removed checks
 
 - Removed the deprecated `zircon-temporary-objects` check. Users should migrate to
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp
index ad2238ff9984f..57ab6456a9987 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp
@@ -12,7 +12,7 @@ bool tryToExtinguishByVal(bool);
 void tryPutFireOut();
 bool callTheFD();
 void scream();
-
+bool isFireFighterComing();
 bool someOtherCondition();
 
 //===--- Basic Positives --------------------------------------------------===//
@@ -278,6 +278,19 @@ void positive_direct_outer_and_rhs() {
     // CHECK-FIXES: {{^\ *$}}
   }
 }
+void positive_direct_outer_and_rhs_bool() {
+  bool onFire = isBurning();
+  bool isComing = isFireFighterComing();
+  if (isComing && onFire) {
+    if (onFire) {
+      // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: redundant condition 'onFire' [bugprone-redundant-branch-condition]
+      // CHECK-FIXES: {{^\ *$}}
+      scream();
+    }
+    // CHECK-FIXES: {{^\ *$}}
+  }
+}
+
 
 void positive_indirect_outer_and_rhs() {
   bool onFire = isBurning();

>From e8b26feed4bce00e77e3e6722d2bebee65a480b6 Mon Sep 17 00:00:00 2001
From: abhay13332 <abhaysingh13072009 at gmail.com>
Date: Sun, 11 Oct 2026 11:21:51 +0530
Subject: [PATCH 2/3] [clang-tidy] Fix spacing issues  in Release Notes

---
 clang-tools-extra/docs/ReleaseNotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clang-tools-extra/docs/ReleaseNotes.md b/clang-tools-extra/docs/ReleaseNotes.md
index 950d11d8bfe6e..fd6683547bd06 100644
--- a/clang-tools-extra/docs/ReleaseNotes.md
+++ b/clang-tools-extra/docs/ReleaseNotes.md
@@ -215,6 +215,7 @@ infrastructure are described first, followed by tool-specific sections.
   <clang-tidy/checks/bugprone/redundant-branch-condition>` check fix for 
   false negative when there are two declaration statement in if with && 
   it skips the second one bind with first one only preveiously.
+  
 - Improved {doc}`bugprone-unchecked-optional-access
   <clang-tidy/checks/bugprone/unchecked-optional-access>` by fixing false
   positives on `bsl::optional` and `bdlb::NullableValue` constructed from a

>From fd3ffd80e3824a2e3510481ce0c2ec140d5047f0 Mon Sep 17 00:00:00 2001
From: Abhay Singh <135463427+Abhay13332 at users.noreply.github.com>
Date: Sun, 11 Oct 2026 20:42:17 +0530
Subject: [PATCH 3/3] Update clang-tools-extra/docs/ReleaseNotes.md

Co-authored-by: Zeyi Xu <zeyi2 at nekoarch.cc>
---
 clang-tools-extra/docs/ReleaseNotes.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/clang-tools-extra/docs/ReleaseNotes.md b/clang-tools-extra/docs/ReleaseNotes.md
index fd6683547bd06..9121d2e0b655c 100644
--- a/clang-tools-extra/docs/ReleaseNotes.md
+++ b/clang-tools-extra/docs/ReleaseNotes.md
@@ -414,7 +414,6 @@ infrastructure are described first, followed by tool-specific sections.
   <clang-tidy/checks/readability/use-std-min-max>` check by fixing spurious
   trailing semicolons and lost comments when the `if` body has no braces.
 
-
 #### Removed checks
 
 - Removed the deprecated `zircon-temporary-objects` check. Users should migrate to