https://github.com/yuhaouy updated https://github.com/llvm/llvm-project/pull/168990
>From e0837e401e2dbe2431efe2b3b8164c748c76e4fe Mon Sep 17 00:00:00 2001 From: Yu Hao <[email protected]> Date: Thu, 20 Nov 2025 18:24:13 -0800 Subject: [PATCH 1/2] Introduce arrayTypeLoc ast matcher for ArrayTypeLoc --- clang/include/clang/ASTMatchers/ASTMatchers.h | 13 ++++++++++++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 2 ++ .../ASTMatchers/ASTMatchersNodeTest.cpp | 20 +++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/clang/include/clang/ASTMatchers/ASTMatchers.h b/clang/include/clang/ASTMatchers/ASTMatchers.h index bca2d8425b3f5..e3ec26207d2bc 100644 --- a/clang/include/clang/ASTMatchers/ASTMatchers.h +++ b/clang/include/clang/ASTMatchers/ASTMatchers.h @@ -7003,6 +7003,19 @@ AST_MATCHER_P(ReferenceTypeLoc, hasReferentLoc, internal::Matcher<TypeLoc>, return ReferentMatcher.matches(Node.getPointeeLoc(), Finder, Builder); } +/// Matches `ArrayTypeLoc`s. +/// +/// Given +/// \code +/// int a[] = {1, 2}; +/// int b[3]; +/// void f() { int c[a[0]]; } +/// \endcode +/// arrayTypeLoc() +/// matches "int a[]", "int b[3]" and "int c[a[0]]". +extern const internal::VariadicDynCastAllOfMatcher<TypeLoc, ArrayTypeLoc> + arrayTypeLoc; + /// Matches template specialization `TypeLoc`s. /// /// Given diff --git a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp index 0874b3d0c45f5..13696a6fc71f2 100644 --- a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp +++ b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -807,6 +807,8 @@ const internal::VariadicDynCastAllOfMatcher<TypeLoc, PointerTypeLoc> pointerTypeLoc; const internal::VariadicDynCastAllOfMatcher<TypeLoc, ReferenceTypeLoc> referenceTypeLoc; +const internal::VariadicDynCastAllOfMatcher<TypeLoc, ArrayTypeLoc> + arrayTypeLoc; const internal::VariadicDynCastAllOfMatcher<TypeLoc, TemplateSpecializationTypeLoc> templateSpecializationTypeLoc; diff --git a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp index 3fcb5582d3dd7..108b32e5d91b9 100644 --- a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp +++ b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp @@ -2353,6 +2353,26 @@ TEST_P(ASTMatchersTest, ReferenceTypeLocTest_BindsToAnyRvalueReferenceTypeLoc) { EXPECT_TRUE(matches("float&& r = 3.0;", matcher)); } +TEST_P(ASTMatchersTest, ArrayTypeLocTest_BindsToAnyArrayTypeLoc) { + auto matcher = varDecl(hasName("x"), hasTypeLoc(arrayTypeLoc())); + EXPECT_TRUE(matches("int x[3];", matcher)); + EXPECT_TRUE(matches("float x[3];", matcher)); + EXPECT_TRUE(matches("char x[3];", matcher)); + EXPECT_TRUE(matches("void* x[3];", matcher)); + EXPECT_TRUE(matches("const int x[3] = {1, 2, 3};", matcher)); + EXPECT_TRUE(matches("int x[3][4];", matcher)); + EXPECT_TRUE(matches("void foo(int x[]);", matcher)); + EXPECT_TRUE(matches("int a[] = {1, 2}; void foo() {int x[a[0]];}", matcher)); +} + +TEST_P(ASTMatchersTest, ArrayTypeLocTest_DoesNotBindToNonArrayTypeLoc) { + auto matcher = varDecl(hasName("x"), hasTypeLoc(arrayTypeLoc())); + EXPECT_TRUE(notMatches("int x;", matcher)); + EXPECT_TRUE(notMatches("float x;", matcher)); + EXPECT_TRUE(notMatches("char x;", matcher)); + EXPECT_TRUE(notMatches("void* x;", matcher)); +} + TEST_P(ASTMatchersTest, TemplateSpecializationTypeLocTest_BindsToVarDeclTemplateSpecialization) { if (!GetParam().isCXX()) { >From e67c7000ab2a6b9997524972c3404fcc8f3c709c Mon Sep 17 00:00:00 2001 From: Yu Hao <[email protected]> Date: Thu, 20 Nov 2025 18:42:18 -0800 Subject: [PATCH 2/2] Fix format issue --- clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp index 13696a6fc71f2..fbb8b49676045 100644 --- a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp +++ b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -807,8 +807,7 @@ const internal::VariadicDynCastAllOfMatcher<TypeLoc, PointerTypeLoc> pointerTypeLoc; const internal::VariadicDynCastAllOfMatcher<TypeLoc, ReferenceTypeLoc> referenceTypeLoc; -const internal::VariadicDynCastAllOfMatcher<TypeLoc, ArrayTypeLoc> - arrayTypeLoc; +const internal::VariadicDynCastAllOfMatcher<TypeLoc, ArrayTypeLoc> arrayTypeLoc; const internal::VariadicDynCastAllOfMatcher<TypeLoc, TemplateSpecializationTypeLoc> templateSpecializationTypeLoc; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
