[Clang-tidy] Make readability-simplify-boolean-expr working with included files

[Eugene.Zelenko]

Summary

This fix for PR26332. I checked it on my work code base.

Build and regressions were OK on RHEL 6.

[aaron.ballman]

Missing a test case for this functionality. The isExpansionInMainFile() was used to silence the diagnostic in macros, but it was pointed out during review that this should be fixed and it seems to have fallen through the cracks. Can you also add tests for macros to ensure the behavior is acceptable there still?

See D8996 for more context.

[Eugene.Zelenko]

I didn't notice test cases for included files for other checkers. So it's hard to tell for should special test case introduced for this specific problem or not.

[Eugene.Zelenko]

I think proper solution will be to create tests for included files ot the fly, bu renaming main test to .h and creating dummy source file. But this is task for scripts wizards :-)

[LegalizeAdulthood]

Again, isn't this already assigned to me in the bug tracker?

In general, my assumption in bug trackers is that if someone has assigned the bug to themselves, then they are working on it.

[LegalizeAdulthood]

In D16794#341552, @aaron.ballman wrote:

Missing a test case for this functionality. The isExpansionInMainFile() was used to silence the diagnostic in macros, but it was pointed out during review that this should be fixed and it seems to have fallen through the cracks. Can you also add tests for macros to ensure the behavior is acceptable there still?

See D8996 for more context.

It hasn't fallen through the cracks, I've been having an offline discussion with Alexander Kornienko about how to get automated checks to work for fixits applied to headers.

[Eugene.Zelenko]

In D16794#343652, @LegalizeAdulthood wrote:

Again, isn't this already assigned to me in the bug tracker?

In general, my assumption in bug trackers is that if someone has assigned the bug to themselves, then they are working on it.

Sorry, if I steeped on you toes. My intention was to backport fix into 3.8 if it'll be OK. Sure, it'll be much better if original author will fix problem.

clang-tidy/readability/SimplifyBooleanExprCheck.cpp

                                                   StringRef BooleanId) {
   Finder->addMatcher(
       binaryOperator(
-          isExpansionInMainFile(), hasOperatorName(OperatorName),
+          hasOperatorName(OperatorName),
           hasLHS(allOf(expr().bind(LHSId),
                        cxxBoolLiteral(equals(Value)).bind(BooleanId))),
           hasRHS(expr().bind(RHSId)),

                                                   StringRef BooleanId) {
   Finder->addMatcher(
       binaryOperator(
-          isExpansionInMainFile(), hasOperatorName(OperatorName),
-          hasLHS(expr().bind(LHSId)),
+          hasOperatorName(OperatorName), hasLHS(expr().bind(LHSId)),
           unless(
               hasLHS(anyOf(cxxBoolLiteral(), hasDescendant(cxxBoolLiteral())))),
           hasRHS(allOf(expr().bind(RHSId),

                                                    StringRef OperatorName,
                                                    StringRef BooleanId) {
   Finder->addMatcher(
-      binaryOperator(isExpansionInMainFile(), hasOperatorName(OperatorName),
+      binaryOperator(hasOperatorName(OperatorName),
                      hasLHS(allOf(expr().bind(LHSId),
                                   ignoringImpCasts(cxxBoolLiteral(equals(Value))
                                                        .bind(BooleanId)))),

                                                    StringRef OperatorName,
                                                    StringRef BooleanId) {
   Finder->addMatcher(
-      binaryOperator(isExpansionInMainFile(), hasOperatorName(OperatorName),
+      binaryOperator(hasOperatorName(OperatorName),
                      unless(hasLHS(hasDescendant(cxxBoolLiteral()))),
                      hasLHS(expr().bind(LHSId)),
                      hasRHS(allOf(expr().bind(RHSId),

 void SimplifyBooleanExprCheck::matchBoolCondition(MatchFinder *Finder,
                                                   bool Value,
                                                   StringRef BooleanId) {
-  Finder->addMatcher(ifStmt(isExpansionInMainFile(),
-                            hasCondition(cxxBoolLiteral(equals(Value))
+  Finder->addMatcher(ifStmt(hasCondition(cxxBoolLiteral(equals(Value))
                                              .bind(BooleanId))).bind(IfStmtId),
                      this);
 }

                                                   bool Value,
                                                   StringRef TernaryId) {
   Finder->addMatcher(
-      conditionalOperator(isExpansionInMainFile(),
-                          hasTrueExpression(cxxBoolLiteral(equals(Value))),
+      conditionalOperator(hasTrueExpression(cxxBoolLiteral(equals(Value))),
                           hasFalseExpression(cxxBoolLiteral(equals(!Value))))
           .bind(TernaryId),
       this);

 void SimplifyBooleanExprCheck::matchIfReturnsBool(MatchFinder *Finder,
                                                   bool Value, StringRef Id) {
   if (ChainedConditionalReturn) {
-    Finder->addMatcher(ifStmt(isExpansionInMainFile(),
-                              hasThen(returnsBool(Value, ThenLiteralId)),
+    Finder->addMatcher(ifStmt(hasThen(returnsBool(Value, ThenLiteralId)),
                               hasElse(returnsBool(!Value))).bind(Id),
                        this);
   } else {
-    Finder->addMatcher(ifStmt(isExpansionInMainFile(),
-                              unless(hasParent(ifStmt())),
+    Finder->addMatcher(ifStmt(unless(hasParent(ifStmt())),
                               hasThen(returnsBool(Value, ThenLiteralId)),
                               hasElse(returnsBool(!Value))).bind(Id),
                        this);

   auto Else = anyOf(SimpleElse, compoundStmt(statementCountIs(1),
                                              hasAnySubstatement(SimpleElse)));
   if (ChainedConditionalAssignment) {
-    Finder->addMatcher(
-        ifStmt(isExpansionInMainFile(), hasThen(Then), hasElse(Else)).bind(Id),
-        this);
+    Finder->addMatcher(ifStmt(hasThen(Then), hasElse(Else)).bind(Id), this);
   } else {
-    Finder->addMatcher(ifStmt(isExpansionInMainFile(),
-                              unless(hasParent(ifStmt())), hasThen(Then),
+    Finder->addMatcher(ifStmt(unless(hasParent(ifStmt())), hasThen(Then),
                               hasElse(Else)).bind(Id),
                        this);
   }