[Clang][ASTMatcher] Add `dependentNameType` Matcher #121263

AmrDeveloper · 2024-12-28T12:25:39Z

Add AST Matcher for DependentNameType

Fixes: #121240

llvmbot · 2024-12-28T12:26:02Z

@llvm/pr-subscribers-clang

Author: Amr Hesham (AmrDeveloper)

Changes

Add AST Matcher for DependentNameType

Fixes: #121240

Full diff: https://github.com/llvm/llvm-project/pull/121263.diff

7 Files Affected:

(modified) clang/docs/LibASTMatchersReference.html (+9)
(modified) clang/docs/ReleaseNotes.rst (+2)
(modified) clang/include/clang/ASTMatchers/ASTMatchers.h (+10)
(modified) clang/lib/ASTMatchers/ASTMatchersInternal.cpp (+1)
(modified) clang/lib/ASTMatchers/Dynamic/Registry.cpp (+1)
(modified) clang/unittests/AST/ASTImporterTest.cpp (-3)
(modified) clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp (+15)

diff --git a/clang/docs/LibASTMatchersReference.html b/clang/docs/LibASTMatchersReference.html
index ddc99020604c94..69fd43b2114723 100644
--- a/clang/docs/LibASTMatchersReference.html
+++ b/clang/docs/LibASTMatchersReference.html
@@ -2536,6 +2536,15 @@ <h2 id="decl-matchers">Node Matchers</h2>
   matches "decltype(i + j)"
 </pre></td></tr>
 
+<tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1Stmt.html">Stmt</a>&gt;</td><td class="name" onclick="toggle('dependentNameType0')"><a name="dependentNameType0Anchor">dependentNameType</a></td><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1DependentNameType.html">DependentNameType</a>&gt;...</td></tr>
+<tr><td colspan="4" class="doc" id="dependentNameType0"><pre>Matches dependent name type.
+
+Example matches T::type
+
+  template <typename T> struct declToImport {
+    typedef typename T::type dependent_name;
+  };
+</pre></td></tr>
 
 <tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>&gt;</td><td class="name" onclick="toggle('deducedTemplateSpecializationType0')"><a name="deducedTemplateSpecializationType0Anchor">deducedTemplateSpecializationType</a></td><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1DeducedTemplateSpecializationType.html">DeducedTemplateSpecializationType</a>&gt;...</td></tr>
 <tr><td colspan="4" class="doc" id="deducedTemplateSpecializationType0"><pre>Matches C++17 deduced template specialization types, e.g. deduced class
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 983c1da20ed4c8..7446aaf57a02dc 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -1110,6 +1110,8 @@ AST Matchers
 
 - Add ``dependentScopeDeclRefExpr`` matcher to match expressions that refer to dependent scope declarations.
 
+- Add ``dependentNameType`` matcher to match dependent name type.
+
 clang-format
 ------------
 
diff --git a/clang/include/clang/ASTMatchers/ASTMatchers.h b/clang/include/clang/ASTMatchers/ASTMatchers.h
index 22e2546ab81e0a..b27914306b8270 100644
--- a/clang/include/clang/ASTMatchers/ASTMatchers.h
+++ b/clang/include/clang/ASTMatchers/ASTMatchers.h
@@ -7711,6 +7711,16 @@ AST_MATCHER_P(DecayedType, hasDecayedType, internal::Matcher<QualType>,
   return InnerType.matches(Node.getDecayedType(), Finder, Builder);
 }
 
+/// Matches dependent name type
+///
+/// Example matches  T::type
+/// \code
+///  template <typename T> struct declToImport {
+///    typedef typename T::type dependent_name;
+///  };
+/// \endcode
+extern const AstTypeMatcher<DependentNameType> dependentNameType;
+
 /// Matches declarations whose declaration context, interpreted as a
 /// Decl, matches \c InnerMatcher.
 ///
diff --git a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
index 8c744eebbdfb50..a47633bf4bae24 100644
--- a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
+++ b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
@@ -1108,6 +1108,7 @@ const AstTypeMatcher<SubstTemplateTypeParmType> substTemplateTypeParmType;
 const AstTypeMatcher<TemplateTypeParmType> templateTypeParmType;
 const AstTypeMatcher<InjectedClassNameType> injectedClassNameType;
 const AstTypeMatcher<DecayedType> decayedType;
+const AstTypeMatcher<DependentNameType> dependentNameType;
 AST_TYPELOC_TRAVERSE_MATCHER_DEF(hasElementType,
                                  AST_POLYMORPHIC_SUPPORTED_TYPES(ArrayType,
                                                                  ComplexType));
diff --git a/clang/lib/ASTMatchers/Dynamic/Registry.cpp b/clang/lib/ASTMatchers/Dynamic/Registry.cpp
index 685d626d2978bf..674129aee59241 100644
--- a/clang/lib/ASTMatchers/Dynamic/Registry.cpp
+++ b/clang/lib/ASTMatchers/Dynamic/Registry.cpp
@@ -218,6 +218,7 @@ RegistryMaps::RegistryMaps() {
   REGISTER_MATCHER(cxxTryStmt);
   REGISTER_MATCHER(cxxUnresolvedConstructExpr);
   REGISTER_MATCHER(decayedType);
+  REGISTER_MATCHER(dependentNameType);
   REGISTER_MATCHER(decl);
   REGISTER_MATCHER(decompositionDecl);
   REGISTER_MATCHER(declCountIs);
diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp
index ec062a5cc953b8..ee1d896f1ca6dc 100644
--- a/clang/unittests/AST/ASTImporterTest.cpp
+++ b/clang/unittests/AST/ASTImporterTest.cpp
@@ -3196,9 +3196,6 @@ TEST_P(ImportExpr, DependentScopeDeclRefExpr) {
                  has(callExpr(has(dependentScopeDeclRefExpr())))))))));
 }
 
-const internal::VariadicDynCastAllOfMatcher<Type, DependentNameType>
-    dependentNameType;
-
 TEST_P(ImportExpr, DependentNameType) {
   MatchVerifier<Decl> Verifier;
   testImport("template <typename T> struct declToImport {"
diff --git a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
index a3baad367a27b1..0a5ecd29432c5f 100644
--- a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
+++ b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
@@ -1912,6 +1912,21 @@ TEST_P(ASTMatchersTest, DeducedTemplateSpecializationType) {
               deducedTemplateSpecializationType()));
 }
 
+TEST_P(ASTMatchersTest, DependentNameType) {
+   if (!GetParam().isCXX()) {
+    // FIXME: Add a test for `dependentNameType()` that does not depend on C++.
+    return;
+  }
+
+  EXPECT_TRUE(matches(
+      R"(
+        template <typename T> struct declToImport {
+          typedef typename T::type dependent_name;
+        };
+      )",
+   dependentNameType()));
+}
+
 TEST_P(ASTMatchersTest, RecordType) {
   EXPECT_TRUE(matches("struct S {}; struct S s;",
                       recordType(hasDeclaration(recordDecl(hasName("S"))))));

github-actions · 2024-12-28T12:29:02Z

✅ With the latest revision this PR passed the C/C++ code formatter.

5chmidti · 2024-12-28T15:15:10Z

clang/lib/ASTMatchers/Dynamic/Registry.cpp

@@ -218,6 +218,7 @@ RegistryMaps::RegistryMaps() {
  REGISTER_MATCHER(cxxTryStmt);
  REGISTER_MATCHER(cxxUnresolvedConstructExpr);
  REGISTER_MATCHER(decayedType);
+  REGISTER_MATCHER(dependentNameType);


Please sort this in alphabetically

Done, thank you

5chmidti · 2024-12-28T15:20:50Z

clang/include/clang/ASTMatchers/ASTMatchers.h

@@ -7711,6 +7711,16 @@ AST_MATCHER_P(DecayedType, hasDecayedType, internal::Matcher<QualType>,
  return InnerType.matches(Node.getDecayedType(), Finder, Builder);
 }

+/// Matches dependent name type


nit: a dependent name type (+1 in release notes)

HighCommander4 · 2024-12-29T06:09:06Z

clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp

@@ -1912,6 +1912,21 @@ TEST_P(ASTMatchersTest, DeducedTemplateSpecializationType) {
              deducedTemplateSpecializationType()));
 }

+TEST_P(ASTMatchersTest, DependentNameType) {
+  if (!GetParam().isCXX()) {
+    // FIXME: Add a test for `dependentNameType()` that does not depend on C++.


Similar to DependentScopeDeclRefExpr, DependentNameType only exists in C++, so this FIXME comment can be removed.

HighCommander4 · 2024-12-29T06:11:09Z

clang/docs/LibASTMatchersReference.html

@@ -2536,6 +2536,15 @@ <h2 id="decl-matchers">Node Matchers</h2>
  matches "decltype(i + j)"
 </pre></td></tr>

+<tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1Stmt.html">Stmt</a>&gt;</td><td class="name" onclick="toggle('dependentNameType0')"><a name="dependentNameType0Anchor">dependentNameType</a></td><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1DependentNameType.html">DependentNameType</a>&gt;...</td></tr>


The first column here should be Matcher<Type>, not Matcher<Stmt>

Thank you, Done

HighCommander4

LGTM, thanks!

HighCommander4 · 2024-12-30T00:40:38Z

~~@AmrDeveloper if you're not tired of these yet, I have one final one: #121307~~

(Update: that one's been taken by another contributor.)

Fixes: llvm#121240

AmrDeveloper · 2024-12-30T09:13:50Z

~~@AmrDeveloper if you're not tired of these yet, I have one final one: #121307~~

(Update: that one's been taken by another contributor.)

@HighCommander4 Thank you, if you find another one, I will be interested to work on it, you can assign me directly, even if it is not good first issue, I am interested to work on bigger ast matcher issues :D

AmrDeveloper added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Dec 28, 2024

AmrDeveloper requested a review from HighCommander4 December 28, 2024 12:25

[Clang][ASTMatcher] Add dependentNameType Matcher

bdbd11d

AmrDeveloper force-pushed the ast_matcher_dependend_name_type branch from 21873d0 to bdbd11d Compare December 28, 2024 12:30

5chmidti reviewed Dec 28, 2024

View reviewed changes

Address code review comments

73ff8bb

AmrDeveloper requested a review from 5chmidti December 28, 2024 18:24

HighCommander4 reviewed Dec 29, 2024

View reviewed changes

Address code review comments

6cf1576

AmrDeveloper requested a review from HighCommander4 December 29, 2024 09:55

HighCommander4 approved these changes Dec 30, 2024

View reviewed changes

HighCommander4 merged commit 6230f1b into llvm:main Dec 30, 2024
9 checks passed

HighCommander4 mentioned this pull request Dec 30, 2024

[clangd] Add a unit test suite for HeuristicResolver #121246

Closed

sunshaoce pushed a commit to sunshaoce/llvm-public that referenced this pull request Dec 30, 2024

[Clang][ASTMatcher] Add dependentNameType AST matcher (llvm#121263)

989a0d7

Fixes: llvm#121240

HighCommander4 mentioned this pull request Dec 30, 2024

Missing AST matcher: dependentTemplateSpecializationType #121307

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Clang][ASTMatcher] Add `dependentNameType` Matcher #121263

[Clang][ASTMatcher] Add `dependentNameType` Matcher #121263

AmrDeveloper commented Dec 28, 2024

llvmbot commented Dec 28, 2024

github-actions bot commented Dec 28, 2024 •

edited

Loading

5chmidti Dec 28, 2024

AmrDeveloper Dec 28, 2024

5chmidti Dec 28, 2024

AmrDeveloper Dec 28, 2024

HighCommander4 Dec 29, 2024

AmrDeveloper Dec 29, 2024

HighCommander4 Dec 29, 2024

AmrDeveloper Dec 29, 2024

HighCommander4 left a comment

HighCommander4 commented Dec 30, 2024 •

edited

Loading

AmrDeveloper commented Dec 30, 2024 •

edited

Loading

[Clang][ASTMatcher] Add dependentNameType Matcher #121263

[Clang][ASTMatcher] Add dependentNameType Matcher #121263

Conversation

AmrDeveloper commented Dec 28, 2024

llvmbot commented Dec 28, 2024

github-actions bot commented Dec 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HighCommander4 left a comment

Choose a reason for hiding this comment

HighCommander4 commented Dec 30, 2024 • edited Loading

AmrDeveloper commented Dec 30, 2024 • edited Loading

[Clang][ASTMatcher] Add `dependentNameType` Matcher #121263

[Clang][ASTMatcher] Add `dependentNameType` Matcher #121263

github-actions bot commented Dec 28, 2024 •

edited

Loading

HighCommander4 commented Dec 30, 2024 •

edited

Loading

AmrDeveloper commented Dec 30, 2024 •

edited

Loading