1 files changed, 14 insertions, 14 deletions

diff --git a/include/clang/AST/TemplateBase.h b/include/clang/AST/TemplateBase.h
index b46b3dc..fe03799 100644
--- a/include/clang/AST/TemplateBase.h
+++ b/include/clang/AST/TemplateBase.h
@@ -29,7 +29,7 @@ namespace clang {
 
 class Decl;
 class Expr;
-class DeclaratorInfo;
+class TypeSourceInfo;
 
 /// \brief Represents a template argument within a class template
 /// specialization.
@@ -267,7 +267,7 @@ struct TemplateArgumentLocInfo {
 private:
   union {
     Expr *Expression;
-    DeclaratorInfo *Declarator;
+    TypeSourceInfo *Declarator;
     struct {
       unsigned QualifierRange[2];
       unsigned TemplateNameLoc;
@@ -277,7 +277,7 @@ private:
 #ifndef NDEBUG
   enum Kind {
     K_None,
-    K_DeclaratorInfo,
+    K_TypeSourceInfo,
     K_Expression,
     K_Template
   } Kind;
@@ -291,10 +291,10 @@ public:
 #endif
     {}
   
-  TemplateArgumentLocInfo(DeclaratorInfo *DInfo)
-    : Declarator(DInfo)
+  TemplateArgumentLocInfo(TypeSourceInfo *TInfo)
+    : Declarator(TInfo)
 #ifndef NDEBUG
-      , Kind(K_DeclaratorInfo) 
+      , Kind(K_TypeSourceInfo) 
 #endif
     {}
   
@@ -316,8 +316,8 @@ public:
     Template.TemplateNameLoc = TemplateNameLoc.getRawEncoding();
   }
 
-  DeclaratorInfo *getAsDeclaratorInfo() const {
-    assert(Kind == K_DeclaratorInfo);
+  TypeSourceInfo *getAsTypeSourceInfo() const {
+    assert(Kind == K_TypeSourceInfo);
     return Declarator;
   }
 
@@ -342,7 +342,7 @@ public:
   void validateForArgument(const TemplateArgument &Arg) {
     switch (Arg.getKind()) {
     case TemplateArgument::Type:
-      assert(Kind == K_DeclaratorInfo);
+      assert(Kind == K_TypeSourceInfo);
       break;
     case TemplateArgument::Expression:
     case TemplateArgument::Declaration:
@@ -356,7 +356,7 @@ public:
       assert(Kind == K_None);
       break;
     case TemplateArgument::Null:
-      llvm::llvm_unreachable("source info for null template argument?");
+      llvm_unreachable("source info for null template argument?");
     }
   }
 #endif
@@ -376,8 +376,8 @@ public:
     : Argument(Argument), LocInfo(Opaque) {
   }
 
-  TemplateArgumentLoc(const TemplateArgument &Argument, DeclaratorInfo *DInfo)
-    : Argument(Argument), LocInfo(DInfo) {
+  TemplateArgumentLoc(const TemplateArgument &Argument, TypeSourceInfo *TInfo)
+    : Argument(Argument), LocInfo(TInfo) {
     assert(Argument.getKind() == TemplateArgument::Type);
   }
 
@@ -412,9 +412,9 @@ public:
     return LocInfo;
   }
 
-  DeclaratorInfo *getSourceDeclaratorInfo() const {
+  TypeSourceInfo *getTypeSourceInfo() const {
     assert(Argument.getKind() == TemplateArgument::Type);
-    return LocInfo.getAsDeclaratorInfo();
+    return LocInfo.getAsTypeSourceInfo();
   }
 
   Expr *getSourceExpression() const {