diff --git a/clang/docs/LibASTMatchersReference.html b/clang/docs/LibASTMatchersReference.html
--- a/clang/docs/LibASTMatchersReference.html
+++ b/clang/docs/LibASTMatchersReference.html
@@ -4671,6 +4671,23 @@
Usable as: Matcher<FunctionDecl>, Matcher<VarDecl>, Matcher<CXXRecordDecl>
+
+
Matcher<clang::ParmVarDecl> | isAtPosition | unsigned N |
+Matches the ParmVarDecl nodes that are at the N'th position in the parameter
+list. The parameter list could be that of either a block, function, or
+objc-method.
+
+
+Given
+
+void f(int a, int b, int c) {
+}
+
+``parmVarDecl(isAtPosition(0))`` matches ``int a``.
+
+``parmVarDecl(isAtPosition(1))`` matches ``int b``.
+ |
+
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
@@ -4615,6 +4615,39 @@
InnerMatcher.matches(*DeclarationStatement, Finder, Builder);
}
+// Returns true if Node is a parameter at N in the given Context
+// of type DeclT.
+template
+static bool __isParamAt(const clang::DeclContext *Context,
+ const clang::ParmVarDecl &Node, unsigned N) {
+ if (const auto *Decl = dyn_cast_or_null(Context))
+ return N < Decl->param_size() && Decl->getParamDecl(N) == &Node;
+
+ return false;
+}
+
+/// Matches the ParmVarDecl nodes that are at the N'th position in the parameter
+/// list. The parameter list could be that of either a block, function, or
+/// objc-method.
+///
+///
+/// Given
+///
+/// \code
+/// void f(int a, int b, int c) {
+/// }
+/// \endcode
+///
+/// ``parmVarDecl(isAtPosition(0))`` matches ``int a``.
+///
+/// ``parmVarDecl(isAtPosition(1))`` matches ``int b``.
+AST_MATCHER_P(clang::ParmVarDecl, isAtPosition, unsigned, N) {
+ const clang::DeclContext *ParentContext = Node.getParentFunctionOrMethod();
+ return __isParamAt(ParentContext, Node, N) ||
+ __isParamAt(ParentContext, Node, N) ||
+ __isParamAt(ParentContext, Node, N);
+}
+
/// Matches the index expression of an array subscript expression.
///
/// Given
diff --git a/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp b/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
--- a/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
+++ b/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
@@ -2643,6 +2643,43 @@
parmVarDecl(hasDefaultArgument())));
}
+TEST(IsAtPosition, Basic) {
+ EXPECT_TRUE(matches("void x(int a, int b) {}", parmVarDecl(isAtPosition(1))));
+ EXPECT_TRUE(matches("void x(int a, int b) {}", parmVarDecl(isAtPosition(0))));
+ EXPECT_TRUE(matches("void x(int a, int b) {}", parmVarDecl(isAtPosition(1))));
+ EXPECT_TRUE(notMatches("void x(int val) {}", parmVarDecl(isAtPosition(1))));
+}
+
+TEST(IsAtPosition, FunctionDecl) {
+ EXPECT_TRUE(matches("void x(int a);", parmVarDecl(isAtPosition(0))));
+ EXPECT_TRUE(matches("void x(int a, int b);", parmVarDecl(isAtPosition(0))));
+ EXPECT_TRUE(matches("void x(int a, int b);", parmVarDecl(isAtPosition(1))));
+ EXPECT_TRUE(notMatches("void x(int val);", parmVarDecl(isAtPosition(1))));
+}
+
+TEST(IsAtPosition, Lambda) {
+ EXPECT_TRUE(
+ matches("void x() { [](int a) {}; }", parmVarDecl(isAtPosition(0))));
+ EXPECT_TRUE(matches("void x() { [](int a, int b) {}; }",
+ parmVarDecl(isAtPosition(0))));
+ EXPECT_TRUE(matches("void x() { [](int a, int b) {}; }",
+ parmVarDecl(isAtPosition(1))));
+ EXPECT_TRUE(
+ notMatches("void x() { [](int val) {}; }", parmVarDecl(isAtPosition(1))));
+}
+
+TEST(IsAtPosition, BlockDecl) {
+ // FIXME: Needs to enable block-support (ie., -fblocks)
+ if (true)
+ return;
+ EXPECT_TRUE(matches("void x() { auto b = ^(int y) { }; } ",
+ parmVarDecl(isAtPosition(0))));
+ EXPECT_TRUE(matches("void x() { auto b = ^(int y,int z) { }; } ",
+ parmVarDecl(isAtPosition(1))));
+ EXPECT_TRUE(notMatches("void x() { auto b = ^(int y) { }; } ",
+ parmVarDecl(isAtPosition(1))));
+}
+
TEST(IsArray, Basic) {
EXPECT_TRUE(matches("struct MyClass {}; MyClass *p1 = new MyClass[10];",
cxxNewExpr(isArray())));