diff --git a/clang/docs/LibASTMatchersReference.html b/clang/docs/LibASTMatchersReference.html
--- a/clang/docs/LibASTMatchersReference.html
+++ b/clang/docs/LibASTMatchersReference.html
@@ -1226,6 +1226,11 @@
+
Matcher<Stmt> | fixedPointLiteral | Matcher<FixedPointLiteral>... |
+Matches fixed point literals
+ |
+
+
Matcher<Stmt> | floatLiteral | Matcher<FloatingLiteral>... |
Matches float literals of all sizes / encodings, e.g.
1.0, 1.0f, 1.0L and 1e10.
@@ -4671,6 +4676,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
@@ -3096,6 +3096,37 @@
internal::TypeList>
hasAncestor;
+/// 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) {
+ constexpr char Name[] = "##isAtPosition_parmVar_";
+
+ // The direct parent of any parmVarDecl is a TypeLoc, and not a Decl,
+ // so we have to go up one more level.
+ return parmVarDecl(
+ hasParent(typeLoc(anyOf(hasParent(blockDecl(hasParameter(
+ N, parmVarDecl().bind(Name)))),
+ hasParent(objcMethodDecl(hasParameter(
+ N, parmVarDecl().bind(Name)))),
+ hasParent(functionDecl(hasParameter(
+ N, parmVarDecl().bind(Name))))))),
+ equalsBoundNode(Name))
+ .matches(Node, Finder, Builder);
+}
+
/// Matches if the provided matcher does not match.
///
/// Example matches Y (matcher = cxxRecordDecl(unless(hasName("X"))))
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,29 @@
parmVarDecl(hasDefaultArgument())));
}
+TEST(IsAtPosition, Basic) {
+ 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))));
+
+ // Tests with function-decls
+ 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))));
+
+ // Tests with lamdas
+ 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(IsArray, Basic) {
EXPECT_TRUE(matches("struct MyClass {}; MyClass *p1 = new MyClass[10];",
cxxNewExpr(isArray())));