maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

In the presence of modules, we can have multiple implicit instantiations of the same template. Teach RecursiveASTVisitor to visit all of those, not just one of them. This is difficult to test by itself, but will be covered by an upcoming change. 

llvm-svn: 204175
This commit is contained in:
Richard Smith 2014-03-18 20:31:31 +00:00
parent aec21ce43e
commit 1b42d1c7ac
2 changed files with 121 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clang/include/clang/AST/DataRecursiveASTVisitor.h
View File

@ -1407,11 +1407,17 @@ template<typename Derived>
bool DataRecursiveASTVisitor<Derived>::TraverseClassInstantiations(
ClassTemplateDecl *D) {
for (auto *SD : D->specializations()) {
switch (SD->getSpecializationKind()) {
for (auto *RD : SD->redecls()) {
// We don't want to visit injected-class-names in this traversal.
if (cast<CXXRecordDecl>(RD)->isInjectedClassName())
continue;
switch (cast<ClassTemplateSpecializationDecl>(RD)->
getSpecializationKind()) {
// Visit the implicit instantiations with the requested pattern.
case TSK_Undeclared:
case TSK_ImplicitInstantiation:
TRY_TO(TraverseDecl(SD));
TRY_TO(TraverseDecl(RD));
break;
// We don't need to do anything on an explicit instantiation
@ -1423,6 +1429,7 @@ bool DataRecursiveASTVisitor<Derived>::TraverseClassInstantiations(
break;
}
}
}
return true;
}
@ -1453,11 +1460,13 @@ template <typename Derived>
bool DataRecursiveASTVisitor<Derived>::TraverseVariableInstantiations(
VarTemplateDecl *D) {
for (auto *SD : D->specializations()) {
switch (SD->getSpecializationKind()) {
for (auto *RD : SD->redecls()) {
switch (cast<VarTemplateSpecializationDecl>(RD)->
getSpecializationKind()) {
// Visit the implicit instantiations with the requested pattern.
case TSK_Undeclared:
case TSK_ImplicitInstantiation:
TRY_TO(TraverseDecl(SD));
TRY_TO(TraverseDecl(RD));
break;
// We don't need to do anything on an explicit instantiation
@ -1469,6 +1478,7 @@ bool DataRecursiveASTVisitor<Derived>::TraverseVariableInstantiations(
break;
}
}
}
return true;
}
@ -1501,15 +1511,18 @@ template<typename Derived>
bool DataRecursiveASTVisitor<Derived>::TraverseFunctionInstantiations(
FunctionTemplateDecl *D) {
for (auto *FD : D->specializations()) {
switch (FD->getTemplateSpecializationKind()) {
for (auto *RD : FD->redecls()) {
switch (RD->getTemplateSpecializationKind()) {
case TSK_Undeclared:
case TSK_ImplicitInstantiation:
// We don't know what kind of FunctionDecl this is.
TRY_TO(TraverseDecl(FD));
TRY_TO(TraverseDecl(RD));
break;
// No need to visit explicit instantiations, we'll find the node
// eventually.
// FIXME: This is incorrect; there is no other node for an explicit
// instantiation of a function template specialization.
case TSK_ExplicitInstantiationDeclaration:
case TSK_ExplicitInstantiationDefinition:
break;
@ -1518,6 +1531,7 @@ bool DataRecursiveASTVisitor<Derived>::TraverseFunctionInstantiations(
break;
}
}
}
return true;
}

86
clang/include/clang/AST/RecursiveASTVisitor.h
View File

@ -1488,35 +1488,59 @@ bool RecursiveASTVisitor<Derived>::TraverseTemplateParameterListHelper(
return true;
}
#define DEF_TRAVERSE_TMPL_INST(TMPLDECLKIND) \
/* A helper method for traversing the implicit instantiations of a
class or variable template. */ \
template<typename Derived> \
bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations( \
TMPLDECLKIND##TemplateDecl *D) { \
for (auto *SD : D->specializations()) { \
switch (SD->getSpecializationKind()) { \
/* Visit the implicit instantiations with the requested pattern. */ \
case TSK_Undeclared: \
case TSK_ImplicitInstantiation: \
TRY_TO(TraverseDecl(SD)); \
break; \
\
/* We don't need to do anything on an explicit instantiation
or explicit specialization because there will be an explicit
node for it elsewhere. */ \
case TSK_ExplicitInstantiationDeclaration: \
case TSK_ExplicitInstantiationDefinition: \
case TSK_ExplicitSpecialization: \
break; \
} \
} \
\
return true; \
template<typename Derived>
bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations(
ClassTemplateDecl *D) {
for (auto *SD : D->specializations()) {
for (auto *RD : SD->redecls()) {
// We don't want to visit injected-class-names in this traversal.
if (cast<CXXRecordDecl>(RD)->isInjectedClassName())
continue;
switch (cast<ClassTemplateSpecializationDecl>(RD)->
getSpecializationKind()) {
// Visit the implicit instantiations with the requested pattern.
case TSK_Undeclared:
case TSK_ImplicitInstantiation:
TRY_TO(TraverseDecl(RD));
break;
// We don't need to do anything on an explicit instantiation
// or explicit specialization because there will be an explicit
// node for it elsewhere.
case TSK_ExplicitInstantiationDeclaration:
case TSK_ExplicitInstantiationDefinition:
case TSK_ExplicitSpecialization:
break;
}
}
}
return true;
}
DEF_TRAVERSE_TMPL_INST(Class)
DEF_TRAVERSE_TMPL_INST(Var)
template<typename Derived>
bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations(
VarTemplateDecl *D) {
for (auto *SD : D->specializations()) {
for (auto *RD : SD->redecls()) {
switch (cast<VarTemplateSpecializationDecl>(RD)->
getSpecializationKind()) {
case TSK_Undeclared:
case TSK_ImplicitInstantiation:
TRY_TO(TraverseDecl(RD));
break;
case TSK_ExplicitInstantiationDeclaration:
case TSK_ExplicitInstantiationDefinition:
case TSK_ExplicitSpecialization:
break;
}
}
}
return true;
}
// A helper method for traversing the instantiations of a
// function while skipping its specializations.
@ -1524,24 +1548,26 @@ template<typename Derived>
bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations(
FunctionTemplateDecl *D) {
for (auto *FD : D->specializations()) {
switch (FD->getTemplateSpecializationKind()) {
for (auto *RD : FD->redecls()) {
switch (RD->getTemplateSpecializationKind()) {
case TSK_Undeclared:
case TSK_ImplicitInstantiation:
// We don't know what kind of FunctionDecl this is.
TRY_TO(TraverseDecl(FD));
TRY_TO(TraverseDecl(RD));
break;
// FIXME: For now traverse explicit instantiations here. Change that
// once they are represented as dedicated nodes in the AST.
case TSK_ExplicitInstantiationDeclaration:
case TSK_ExplicitInstantiationDefinition:
TRY_TO(TraverseDecl(FD));
TRY_TO(TraverseDecl(RD));
break;
case TSK_ExplicitSpecialization:
break;
}
}
}
return true;
}