diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-05-01 01:05:51 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-05-01 01:05:51 +0000 |
| commit | b7efff4bae117604f442bb6859c844f90b15f3ff (patch) | |
| tree | 51c17690ef117bb32ca255932f444eb590c53d19 /lib | |
| parent | 4fb86f8c4585e53c21c847ad3de9e3b2de123cd9 (diff) | |
Switch the interface name for both TemplateTypeParmType and
SubstTemplateTypeParmType to be 'getIdentifier' instead of 'getName' as
it returns an identifier. This makes them more consistent with the
NamedDecl interface.
Also, switch back to using this interface to acquire the indentifier in
TypePrinter.cpp. I missed this in r130628.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130629 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/Type.cpp | 2 | ||||
| -rw-r--r-- | lib/AST/TypePrinter.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplateVariadic.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index 1ed1770426..9eb497bea6 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -1504,7 +1504,7 @@ bool EnumType::classof(const TagType *TT) { return isa<EnumDecl>(TT->getDecl()); } -IdentifierInfo *TemplateTypeParmType::getName() const { +IdentifierInfo *TemplateTypeParmType::getIdentifier() const { return isCanonicalUnqualified() ? 0 : getDecl()->getIdentifier(); } diff --git a/lib/AST/TypePrinter.cpp b/lib/AST/TypePrinter.cpp index a0d40e14d7..0c5df7fae6 100644 --- a/lib/AST/TypePrinter.cpp +++ b/lib/AST/TypePrinter.cpp @@ -653,7 +653,7 @@ void TypePrinter::printTemplateTypeParm(const TemplateTypeParmType *T, if (!S.empty()) // Prefix the basic type, e.g. 'parmname X'. S = ' ' + S; - if (IdentifierInfo *Id = T->getDecl() ? T->getDecl()->getIdentifier() : 0) + if (IdentifierInfo *Id = T->getIdentifier()) S = Id->getName().str() + S; else S = "type-parameter-" + llvm::utostr_32(T->getDepth()) + '-' + diff --git a/lib/Sema/SemaTemplateVariadic.cpp b/lib/Sema/SemaTemplateVariadic.cpp index 5c321fd6df..096d353bcc 100644 --- a/lib/Sema/SemaTemplateVariadic.cpp +++ b/lib/Sema/SemaTemplateVariadic.cpp @@ -167,7 +167,7 @@ DiagnoseUnexpandedParameterPacks(Sema &S, SourceLocation Loc, IdentifierInfo *Name = 0; if (const TemplateTypeParmType *TTP = Unexpanded[I].first.dyn_cast<const TemplateTypeParmType *>()) - Name = TTP->getName(); + Name = TTP->getIdentifier(); else Name = Unexpanded[I].first.get<NamedDecl *>()->getIdentifier(); @@ -483,7 +483,7 @@ bool Sema::CheckParameterPacksForExpansion(SourceLocation EllipsisLoc, = Unexpanded[I].first.dyn_cast<const TemplateTypeParmType *>()) { Depth = TTP->getDepth(); Index = TTP->getIndex(); - Name = TTP->getName(); + Name = TTP->getIdentifier(); } else { NamedDecl *ND = Unexpanded[I].first.get<NamedDecl *>(); if (isa<ParmVarDecl>(ND)) |