diff --git a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp --- a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp @@ -441,8 +441,6 @@ return Node.isIntegerConstantExpr(Finder->getASTContext()); } -AST_MATCHER(Expr, isRequiresExpr) { return isa(Node); } - AST_MATCHER(BinaryOperator, operandsAreEquivalent) { return areEquivalentExpr(Node.getLHS(), Node.getRHS()); } @@ -862,7 +860,8 @@ const auto BannedIntegerLiteral = integerLiteral(expandedByMacro(KnownBannedMacroNames)); - const auto BannedAncestor = expr(isRequiresExpr()); + const auto IsInUnevaluatedContext = expr(anyOf( + hasAncestor(expr(hasUnevaluatedContext())), hasAncestor(typeLoc()))); // Binary with equivalent operands, like (X != 2 && X != 2). Finder->addMatcher( @@ -879,7 +878,7 @@ unless(hasEitherOperand(hasType(realFloatingPointType()))), unless(hasLHS(AnyLiteralExpr)), unless(hasDescendant(BannedIntegerLiteral)), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("binary")), this); @@ -893,7 +892,7 @@ unless(binaryOperatorIsInMacro()), // TODO: if the banned macros are themselves duplicated unless(hasDescendant(BannedIntegerLiteral)), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("nested-duplicates"), this); @@ -904,7 +903,7 @@ // Filter noisy false positives. unless(conditionalOperatorIsInMacro()), unless(isInTemplateInstantiation()), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("cond")), this); @@ -918,7 +917,7 @@ parametersAreEquivalent(), // Filter noisy false positives. unless(isMacro()), unless(isInTemplateInstantiation()), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("call")), this); @@ -929,7 +928,7 @@ nestedParametersAreEquivalent(), argumentCountIs(2), // Filter noisy false positives. unless(isMacro()), unless(isInTemplateInstantiation()), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("nested-duplicates"), this); @@ -947,7 +946,7 @@ integerLiteral())), hasRHS(integerLiteral()))))) .bind("logical-bitwise-confusion")), - unless(hasAncestor(BannedAncestor)))), + unless(IsInUnevaluatedContext))), this); // Match expressions like: (X << 8) & 0xFF @@ -961,7 +960,7 @@ integerLiteral().bind("shift-const"))))), ignoringParenImpCasts( integerLiteral().bind("and-const"))), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("left-right-shift-confusion")), this); @@ -980,7 +979,7 @@ Finder->addMatcher( traverse(TK_AsIs, binaryOperator(isComparisonOperator(), hasOperands(BinOpCstLeft, CstRight), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("binop-const-compare-to-const")), this); @@ -991,7 +990,7 @@ binaryOperator(isComparisonOperator(), anyOf(allOf(hasLHS(BinOpCstLeft), hasRHS(SymRight)), allOf(hasLHS(SymRight), hasRHS(BinOpCstLeft))), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("binop-const-compare-to-sym")), this); @@ -1002,7 +1001,7 @@ hasRHS(BinOpCstRight), // Already reported as redundant. unless(operandsAreEquivalent()), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("binop-const-compare-to-binop-const")), this); @@ -1019,7 +1018,7 @@ hasLHS(ComparisonLeft), hasRHS(ComparisonRight), // Already reported as redundant. unless(operandsAreEquivalent()), - unless(hasAncestor(BannedAncestor))) + unless(IsInUnevaluatedContext)) .bind("comparisons-of-symbol-and-const")), this); } diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -198,6 +198,10 @@ ` check by adding option `DeduplicateFindings` to output one finding per symbol occurrence. +- Improved :doc:`misc-redundant-expression + ` check to ignore + false-positives in unevaluated context (e.g., ``decltype``). + - Improved :doc:`modernize-loop-convert ` to support for-loops with iterators initialized by free functions like ``begin``, ``end``, or ``size``. diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp @@ -855,3 +855,11 @@ // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: both sides of operator are equivalent } + +namespace PR35857 { + void test() { + int x = 0; + int y = 0; + decltype(x + y - (x + y)) z = 10; + } +}