Index: clang-tools-extra/trunk/clang-tidy/abseil/DurationFactoryScaleCheck.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/abseil/DurationFactoryScaleCheck.cpp +++ clang-tools-extra/trunk/clang-tidy/abseil/DurationFactoryScaleCheck.cpp @@ -123,6 +123,10 @@ hasArgument( 0, ignoringImpCasts(anyOf( + cxxFunctionalCastExpr( + hasDestinationType( + anyOf(isInteger(), realFloatingPointType())), + hasSourceExpression(initListExpr())), integerLiteral(equals(0)), floatLiteral(equals(0.0)), binaryOperator(hasOperatorName("*"), hasEitherOperand(ignoringImpCasts( Index: clang-tools-extra/trunk/clang-tidy/abseil/DurationRewriter.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/abseil/DurationRewriter.cpp +++ clang-tools-extra/trunk/clang-tidy/abseil/DurationRewriter.cpp @@ -105,14 +105,44 @@ llvm_unreachable("unknown scaling factor"); } +/// Matches the n'th item of an initializer list expression. +/// +/// Example matches y. +/// (matcher = initListExpr(hasInit(0, expr()))) +/// \code +/// int x{y}. +/// \endcode +AST_MATCHER_P2(InitListExpr, hasInit, unsigned, N, + ast_matchers::internal::Matcher, InnerMatcher) { + return N < Node.getNumInits() && + InnerMatcher.matches(*Node.getInit(N)->IgnoreParenImpCasts(), Finder, + Builder); +} + /// Returns `true` if `Node` is a value which evaluates to a literal `0`. bool IsLiteralZero(const MatchFinder::MatchResult &Result, const Expr &Node) { - return selectFirst( - "val", - match(expr(ignoringImpCasts(anyOf(integerLiteral(equals(0)), - floatLiteral(equals(0.0))))) - .bind("val"), - Node, *Result.Context)) != nullptr; + auto ZeroMatcher = + anyOf(integerLiteral(equals(0)), floatLiteral(equals(0.0))); + + // Check to see if we're using a zero directly. + if (selectFirst( + "val", match(expr(ignoringImpCasts(ZeroMatcher)).bind("val"), Node, + *Result.Context)) != nullptr) + return true; + + // Now check to see if we're using a functional cast with a scalar + // initializer expression, e.g. `int{0}`. + if (selectFirst( + "val", + match(cxxFunctionalCastExpr( + hasDestinationType( + anyOf(isInteger(), realFloatingPointType())), + hasSourceExpression(initListExpr(hasInit(0, ZeroMatcher)))) + .bind("val"), + Node, *Result.Context)) != nullptr) + return true; + + return false; } llvm::Optional Index: clang-tools-extra/trunk/test/clang-tidy/abseil-duration-factory-scale.cpp =================================================================== --- clang-tools-extra/trunk/test/clang-tidy/abseil-duration-factory-scale.cpp +++ clang-tools-extra/trunk/test/clang-tidy/abseil-duration-factory-scale.cpp @@ -2,6 +2,9 @@ #include "absl/time/time.h" +namespace std { typedef long long int64_t; } +using int64_t = std::int64_t; + void ScaleTest() { absl::Duration d; @@ -30,6 +33,15 @@ d = absl::Seconds(0x0.000001p-126f); // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use ZeroDuration() for zero-length time intervals [abseil-duration-factory-scale] // CHECK-FIXES: absl::ZeroDuration(); + d = absl::Seconds(int{0}); + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use ZeroDuration() for zero-length time intervals [abseil-duration-factory-scale] + // CHECK-FIXES: absl::ZeroDuration(); + d = absl::Seconds(int64_t{0}); + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use ZeroDuration() for zero-length time intervals [abseil-duration-factory-scale] + // CHECK-FIXES: absl::ZeroDuration(); + d = absl::Seconds(float{0}); + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use ZeroDuration() for zero-length time intervals [abseil-duration-factory-scale] + // CHECK-FIXES: absl::ZeroDuration(); // Fold seconds into minutes d = absl::Seconds(30 * 60); @@ -83,6 +95,8 @@ // None of these should trigger the check d = absl::Seconds(60); + d = absl::Seconds(int{60}); + d = absl::Seconds(float{60}); d = absl::Seconds(60 + 30); d = absl::Seconds(60 - 30); d = absl::Seconds(50 * 30);