Index: clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp =================================================================== --- clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp +++ clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp @@ -72,8 +72,8 @@ Expr::const_child_iterator LeftIter = Left->child_begin(); Expr::const_child_iterator RightIter = Right->child_begin(); while (LeftIter != Left->child_end() && RightIter != Right->child_end()) { - if (!areEquivalentExpr(dyn_cast(*LeftIter), - dyn_cast(*RightIter))) + if (!areEquivalentExpr(dyn_cast_or_null(*LeftIter), + dyn_cast_or_null(*RightIter))) return false; ++LeftIter; ++RightIter; @@ -117,6 +117,9 @@ case Stmt::MemberExprClass: return cast(Left)->getMemberDecl() == cast(Right)->getMemberDecl(); + case Stmt::CXXFoldExprClass: + return cast(Left)->getOperator() == + cast(Right)->getOperator(); case Stmt::CXXFunctionalCastExprClass: case Stmt::CStyleCastExprClass: return cast(Left)->getTypeAsWritten() == Index: clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp =================================================================== --- clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp +++ clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp @@ -15,6 +15,30 @@ extern int bar(int x); extern int bat(int x, int y); +namespace no_crash { +struct Foo {}; +bool operator<(const Foo &, const Foo &); +template +struct Bar { + static const Foo &GetFoo(); + static bool Test(const T &maybe_foo, const Foo &foo) { + return foo < GetFoo() && foo < maybe_foo; + } +}; + +template +struct Bar2 { + static_assert((... && (sizeof(Values) > 0)) || (... && (sizeof(Values) > 0))); + // CHECK-MESSAGES: :[[@LINE-1]]:47: warning: both sides of operator are equivalent [misc-redundant-expression] +}; +} // namespace no_crash + +template +int TestOperatorConfusionDependent(int Y) { + int r1 = (Y << Shift) & 0xff; + int r2 = (Y << 8) & Mask; +} + int TestSimpleEquivalent(int X, int Y) { if (X - X) return 1; // CHECK-MESSAGES: :[[@LINE-1]]:9: warning: both sides of operator are equivalent [misc-redundant-expression] @@ -774,23 +798,6 @@ // CHECK-FIXES: {{^}} return ~(1 | 2 | 4);{{$}} } -template -int TestOperatorConfusionDependent(int Y) { - int r1 = (Y << Shift) & 0xff; - int r2 = (Y << 8) & Mask; -} #undef FLAG1 #undef FLAG2 #undef FLAG3 - -namespace no_crash { -struct Foo {}; -bool operator<(const Foo&, const Foo&); -template -struct Bar { - static const Foo &GetFoo(); - static bool Test(const T & maybe_foo, const Foo& foo) { - return foo < GetFoo() && foo < maybe_foo; - } -}; -}