From 6339f1a028c7e9cc5150fcdd6b5363ee952e931f Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 13 Sep 2016 15:05:04 +0000 Subject: [PATCH] Traversing template paramter lists of DeclaratorDecls and/or TagDecls. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The unit tests in this patch demonstrate the need to traverse template parameter lists of DeclaratorDecls (e.g. VarDecls, CXXMethodDecls) and TagDecls (e.g. EnumDecls, RecordDecls). Fixes PR29042. https://reviews.llvm.org/D24268 Patch from Lukasz Łukasz Anforowicz ! llvm-svn: 281345 --- clang/include/clang/AST/RecursiveASTVisitor.h | 20 ++++++ .../ASTMatchers/ASTMatchersTraversalTest.cpp | 83 ++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h index 0f01033..77decd7 100644 --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -482,6 +482,11 @@ public: private: // These are helper methods used by more than one Traverse* method. bool TraverseTemplateParameterListHelper(TemplateParameterList *TPL); + + // Traverses template parameter lists of either a DeclaratorDecl or TagDecl. + template + bool TraverseDeclTemplateParameterLists(T *D); + #define DEF_TRAVERSE_TMPL_INST(TMPLDECLKIND) \ bool TraverseTemplateInstantiations(TMPLDECLKIND##TemplateDecl *D); DEF_TRAVERSE_TMPL_INST(Class) @@ -1534,6 +1539,16 @@ bool RecursiveASTVisitor::TraverseTemplateParameterListHelper( } template +template +bool RecursiveASTVisitor::TraverseDeclTemplateParameterLists(T *D) { + for (unsigned i = 0; i < D->getNumTemplateParameterLists(); i++) { + TemplateParameterList *TPL = D->getTemplateParameterList(i); + TraverseTemplateParameterListHelper(TPL); + } + return true; +} + +template bool RecursiveASTVisitor::TraverseTemplateInstantiations( ClassTemplateDecl *D) { for (auto *SD : D->specializations()) { @@ -1694,6 +1709,8 @@ DEF_TRAVERSE_DECL(UnresolvedUsingTypenameDecl, { }) DEF_TRAVERSE_DECL(EnumDecl, { + TRY_TO(TraverseDeclTemplateParameterLists(D)); + if (D->getTypeForDecl()) TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0))); @@ -1708,6 +1725,7 @@ bool RecursiveASTVisitor::TraverseRecordHelper(RecordDecl *D) { // We shouldn't traverse D->getTypeForDecl(); it's a result of // declaring the type, not something that was written in the source. + TRY_TO(TraverseDeclTemplateParameterLists(D)); TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc())); return true; } @@ -1802,6 +1820,7 @@ DEF_TRAVERSE_DECL(IndirectFieldDecl, {}) template bool RecursiveASTVisitor::TraverseDeclaratorHelper(DeclaratorDecl *D) { + TRY_TO(TraverseDeclTemplateParameterLists(D)); TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc())); if (D->getTypeSourceInfo()) TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc())); @@ -1848,6 +1867,7 @@ DEF_TRAVERSE_DECL(ObjCIvarDecl, { template bool RecursiveASTVisitor::TraverseFunctionHelper(FunctionDecl *D) { + TRY_TO(TraverseDeclTemplateParameterLists(D)); TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc())); TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo())); diff --git a/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp b/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp index fcd3dcb5..ff45fe6 100644 --- a/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp +++ b/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp @@ -641,6 +641,89 @@ TEST(TemplateArgument, Matches) { functionDecl(hasAnyTemplateArgument(templateArgument())))); } +TEST(TemplateTypeParmDecl, CXXMethodDecl) { + const char input[] = + "template\n" + "class Class {\n" + " void method();\n" + "};\n" + "template\n" + "void Class::method() {}\n"; + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U")))); +} + +TEST(TemplateTypeParmDecl, VarDecl) { + const char input[] = + "template\n" + "class Class {\n" + " static T pi;\n" + "};\n" + "template\n" + "U Class::pi = U(3.1415926535897932385);\n"; + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U")))); +} + +TEST(TemplateTypeParmDecl, VarTemplatePartialSpecializationDecl) { + const char input[] = + "template\n" + "struct Struct {\n" + " template static int field;\n" + "};\n" + "template\n" + "template\n" + "int Struct::field = 123;\n"; + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T2")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U2")))); +} + +TEST(TemplateTypeParmDecl, ClassTemplatePartialSpecializationDecl) { + const char input[] = + "template\n" + "class Class {\n" + " template struct Struct;\n" + "};\n" + "template\n" + "template\n" + "struct Class::Struct {};\n"; + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T2")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U2")))); +} + +TEST(TemplateTypeParmDecl, EnumDecl) { + const char input[] = + "template\n" + "struct Struct {\n" + " enum class Enum : T;\n" + "};\n" + "template\n" + "enum class Struct::Enum : U {\n" + " e1,\n" + " e2\n" + "};\n"; + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U")))); +} + +TEST(TemplateTypeParmDecl, RecordDecl) { + const char input[] = + "template\n" + "class Class {\n" + " struct Struct;\n" + "};\n" + "template\n" + "struct Class::Struct {\n" + " U field;\n" + "};\n"; + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T")))); + EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U")))); +} + TEST(RefersToIntegralType, Matches) { EXPECT_TRUE(matches("template struct C {}; C<42> c;", classTemplateSpecializationDecl( -- 2.7.4