Index: include/clang/AST/ExprCXX.h =================================================================== --- include/clang/AST/ExprCXX.h +++ include/clang/AST/ExprCXX.h @@ -3426,16 +3426,22 @@ unsigned arg_size() const { return NumArgs; } using arg_iterator = Expr **; + using arg_range = llvm::iterator_range; arg_iterator arg_begin() { return getTrailingObjects(); } arg_iterator arg_end() { return arg_begin() + NumArgs; } + arg_range arguments() { return arg_range(arg_begin(), arg_end()); } using const_arg_iterator = const Expr* const *; + using arg_const_range = llvm::iterator_range; const_arg_iterator arg_begin() const { return getTrailingObjects(); } const_arg_iterator arg_end() const { return arg_begin() + NumArgs; } + arg_const_range arguments() const { + return arg_const_range(arg_begin(), arg_end()); + } Expr *getArg(unsigned I) { assert(I < NumArgs && "Argument index out-of-range"); Index: include/clang/ASTMatchers/ASTMatchers.h =================================================================== --- include/clang/ASTMatchers/ASTMatchers.h +++ include/clang/ASTMatchers/ASTMatchers.h @@ -3537,9 +3537,9 @@ /// objcMessageExpr(hasAnyArgument(integerLiteral(equals(12)))) /// matches [i f:12] AST_POLYMORPHIC_MATCHER_P(hasAnyArgument, - AST_POLYMORPHIC_SUPPORTED_TYPES(CallExpr, - CXXConstructExpr, - ObjCMessageExpr), + AST_POLYMORPHIC_SUPPORTED_TYPES( + CallExpr, CXXConstructExpr, + CXXUnresolvedConstructExpr, ObjCMessageExpr), internal::Matcher, InnerMatcher) { for (const Expr *Arg : Node.arguments()) { BoundNodesTreeBuilder Result(*Builder); Index: unittests/ASTMatchers/ASTMatchersTraversalTest.cpp =================================================================== --- unittests/ASTMatchers/ASTMatchersTraversalTest.cpp +++ unittests/ASTMatchers/ASTMatchersTraversalTest.cpp @@ -406,9 +406,22 @@ auto HasArgumentY = hasAnyArgument( ignoringParenImpCasts(declRefExpr(to(varDecl(hasName("y")))))); StatementMatcher CallArgumentY = callExpr(HasArgumentY); + StatementMatcher CtorArgumentY = cxxConstructExpr(HasArgumentY); + StatementMatcher UnresolvedCtorArgumentY = + cxxUnresolvedConstructExpr(HasArgumentY); StatementMatcher ObjCCallArgumentY = objcMessageExpr(HasArgumentY); EXPECT_TRUE(matches("void x(int, int) { int y; x(1, y); }", CallArgumentY)); EXPECT_TRUE(matches("void x(int, int) { int y; x(y, 42); }", CallArgumentY)); + EXPECT_TRUE(matches("struct Y { Y(int, int); };" + "void x() { int y; (void)Y(1, y); }", + CtorArgumentY)); + EXPECT_TRUE(matches("struct Y { Y(int, int); };" + "void x() { int y; (void)Y(y, 42); }", + CtorArgumentY)); + EXPECT_TRUE(matches("template void x() { int y; (void)Y(1, y); }", + UnresolvedCtorArgumentY)); + EXPECT_TRUE(matches("template void x() { int y; (void)Y(y, 42); }", + UnresolvedCtorArgumentY)); EXPECT_TRUE(matchesObjC("@interface I -(void)f:(int) y; @end " "void x(I* i) { int y; [i f:y]; }", ObjCCallArgumentY)); @@ -416,6 +429,12 @@ "void x(I* i) { int z; [i f:z]; }", ObjCCallArgumentY)); EXPECT_TRUE(notMatches("void x(int, int) { x(1, 2); }", CallArgumentY)); + EXPECT_TRUE(notMatches("struct Y { Y(int, int); };" + "void x() { int y; (void)Y(1, 2); }", + CtorArgumentY)); + EXPECT_TRUE(notMatches("template " + "void x() { int y; (void)Y(1, 2); }", + UnresolvedCtorArgumentY)); StatementMatcher ImplicitCastedArgument = callExpr( hasAnyArgument(implicitCastExpr()));