commit b7efff4bae117604f442bb6859c844f90b15f3ff
author Chandler Carruth <chandlerc@gmail.com> Sun May 01 01:05:51 2011 +0000
committer Chandler Carruth <chandlerc@gmail.com> Sun May 01 01:05:51 2011 +0000
tree 51c17690ef117bb32ca255932f444eb590c53d19
parent 4fb86f8c4585e53c21c847ad3de9e3b2de123cd9

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

include/clang/AST/CanonicalType.h

diff --git a/include/clang/AST/CanonicalType.h b/include/clang/AST/CanonicalType.h
index ce2b3cd..b3550f8 100644
--- a/include/clang/AST/CanonicalType.h
+++ b/include/clang/AST/CanonicalType.h
@@ -656,7 +656,7 @@
   LLVM_CLANG_CANPROXY_SIMPLE_ACCESSOR(unsigned, getIndex)
   LLVM_CLANG_CANPROXY_SIMPLE_ACCESSOR(bool, isParameterPack)
   LLVM_CLANG_CANPROXY_SIMPLE_ACCESSOR(TemplateTypeParmDecl *, getDecl)
-  LLVM_CLANG_CANPROXY_SIMPLE_ACCESSOR(IdentifierInfo *, getName)
+  LLVM_CLANG_CANPROXY_SIMPLE_ACCESSOR(IdentifierInfo *, getIdentifier)
 };
 
 template<>

include/clang/AST/Type.h

diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index cd7138d..a499921 100644
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -3015,7 +3015,7 @@
     return isCanonicalUnqualified() ? 0 : TTPDecl;
   }
 
-  IdentifierInfo *getName() const;
+  IdentifierInfo *getIdentifier() const;
 
   bool isSugared() const { return false; }
   QualType desugar() const { return QualType(this, 0); }
@@ -3119,7 +3119,7 @@
   friend class ASTContext;
   
 public:
-  IdentifierInfo *getName() const { return Replaced->getName(); }
+  IdentifierInfo *getIdentifier() const { return Replaced->getIdentifier(); }
   
   /// Gets the template parameter that was substituted for.
   const TemplateTypeParmType *getReplacedParameter() const {

lib/AST/Type.cpp

diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 1ed1770..9eb497b 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -1504,7 +1504,7 @@
   return isa<EnumDecl>(TT->getDecl());
 }
 
-IdentifierInfo *TemplateTypeParmType::getName() const {
+IdentifierInfo *TemplateTypeParmType::getIdentifier() const {
   return isCanonicalUnqualified() ? 0 : getDecl()->getIdentifier();
 }
 

lib/AST/TypePrinter.cpp

diff --git a/lib/AST/TypePrinter.cpp b/lib/AST/TypePrinter.cpp
index a0d40e1..0c5df7f 100644
--- a/lib/AST/TypePrinter.cpp
+++ b/lib/AST/TypePrinter.cpp
@@ -653,7 +653,7 @@
   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()) + '-' +

lib/Sema/SemaTemplateVariadic.cpp

diff --git a/lib/Sema/SemaTemplateVariadic.cpp b/lib/Sema/SemaTemplateVariadic.cpp
index 5c321fd..096d353 100644
--- a/lib/Sema/SemaTemplateVariadic.cpp
+++ b/lib/Sema/SemaTemplateVariadic.cpp
@@ -167,7 +167,7 @@
     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 @@
         = 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))