diff --git a/clang/include/clang/ASTMatchers/ASTMatchers.h b/clang/include/clang/ASTMatchers/ASTMatchers.h --- a/clang/include/clang/ASTMatchers/ASTMatchers.h +++ b/clang/include/clang/ASTMatchers/ASTMatchers.h @@ -4440,6 +4440,29 @@ return NumArgs == N; } +/// Checks that a call expression or a constructor call expression has +/// a specific number of arguments (EXCLUDING absent default arguments). +/// +/// Example matches f(0, 0) but not f(0) (matcher = callExpr(argumentsGivenCountIs(2))) +/// \code +/// void f(int x, int y = 0); +/// f(0, 0); +/// f(0); +/// \endcode +AST_POLYMORPHIC_MATCHER_P(argumentsGivenCountIs, + AST_POLYMORPHIC_SUPPORTED_TYPES( + CallExpr, CXXConstructExpr, + CXXUnresolvedConstructExpr, ObjCMessageExpr), + unsigned, N) { + unsigned NumArgs = Node.getNumArgs(); + while (NumArgs) { + if (!isa(Node.getArg(NumArgs - 1))) + break; + --NumArgs; + } + return NumArgs == N; +} + /// Matches the n'th argument of a call expression or a constructor /// call expression. /// diff --git a/clang/lib/ASTMatchers/Dynamic/Registry.cpp b/clang/lib/ASTMatchers/Dynamic/Registry.cpp --- a/clang/lib/ASTMatchers/Dynamic/Registry.cpp +++ b/clang/lib/ASTMatchers/Dynamic/Registry.cpp @@ -135,6 +135,7 @@ REGISTER_MATCHER(anyOf); REGISTER_MATCHER(anything); REGISTER_MATCHER(argumentCountIs); + REGISTER_MATCHER(argumentsGivenCountIs); REGISTER_MATCHER(arraySubscriptExpr); REGISTER_MATCHER(arrayType); REGISTER_MATCHER(asString);