[clang] Changed IsInsideCondition field to private

Author: PhilippRados

clang/include/clang/AST/Expr.h

@@ -109,18 +109,18 @@ struct SubobjectAdjustment {
 /// required.
 class Expr : public ValueStmt {
   QualType TR;
+  bool IsInsideCondition;
 
 public:
   Expr() = delete;
   Expr(const Expr&) = delete;
   Expr(Expr &&) = delete;
   Expr &operator=(const Expr&) = delete;
   Expr &operator=(Expr&&) = delete;
-  bool isCondition;
 
 protected:
   Expr(StmtClass SC, QualType T, ExprValueKind VK, ExprObjectKind OK)
-      : ValueStmt(SC), isCondition(false) {
+      : ValueStmt(SC), IsInsideCondition(false) {
     ExprBits.Dependent = 0;
     ExprBits.ValueKind = VK;
     ExprBits.ObjectKind = OK;
@@ -451,6 +451,16 @@ class Expr : public ValueStmt {
     return (OK == OK_Ordinary || OK == OK_BitField);
   }
 
+  bool isInsideCondition() const {
+    return IsInsideCondition;
+  }
+
+  /// setValueKind - Mark this expression to be inside a condition.
+  /// necessary for `warn_assignment_bool_context` diagnostic
+  void setIsInsideCondition() {
+    IsInsideCondition = true;
+  }
+
   /// setValueKind - Set the value kind produced by this expression.
   void setValueKind(ExprValueKind Cat) { ExprBits.ValueKind = Cat; }
 

clang/lib/Sema/Sema.cpp

@@ -704,7 +704,7 @@ void Sema::DiagnoseAssignmentBoolContext(Expr *E, QualType Ty) {
     }
 
     // Condition-assignment warnings are already handled by `DiagnoseAssignmentAsCondition()`
-    if (E->isCondition)
+    if (E->isInsideCondition())
       return;
 
     if (BinaryOperator *Op = dyn_cast<BinaryOperator>(E)) {

clang/lib/Sema/SemaExpr.cpp

@@ -20288,7 +20288,7 @@ void Sema::DiagnoseEqualityWithExtraParens(ParenExpr *ParenE) {
 ExprResult Sema::CheckBooleanCondition(SourceLocation Loc, Expr *E,
                                        bool IsConstexpr) {
   DiagnoseAssignmentAsCondition(E);
-  E->isCondition = true;
+  E->setIsInsideCondition();
 
   if (ParenExpr *parenE = dyn_cast<ParenExpr>(E))
     DiagnoseEqualityWithExtraParens(parenE);