commit 1d752d7d68359fd8f7701585d4658aa70e129261
author Douglas Gregor <dgregor@apple.com> Wed Mar 02 18:46:51 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Mar 02 18:46:51 2011 +0000
tree 0f904fc734272d7cfc68baedef831bf1bdbdf1ea
parent b71d821d64af88749fc9860fd43a5164d8d819c8

Kill off the TreeTransform::TransformTemplateName overload that has
poor source-location information.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126852 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 90b0d7e..49f9a1d 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -2105,7 +2105,6 @@
 ///
 /// \param Converted the list of template arguments provided for template
 /// parameters that precede \p Param in the template parameter list.
-///
 /// \returns the substituted template argument, or NULL if an error occurred.
 static TypeSourceInfo *
 SubstDefaultTemplateArgument(Sema &SemaRef,
@@ -2202,8 +2201,8 @@
 /// \param Converted the list of template arguments provided for template
 /// parameters that precede \p Param in the template parameter list.
 ///
-/// \param QualifierLoc The nested-name-specifier, with source-location 
-/// information, which will also be instantiated and updated.
+/// \param QualifierLoc Will be set to the nested-name-specifier (with 
+/// source-location information) that precedes the template name.
 ///
 /// \returns the substituted template argument, or NULL if an error occurred.
 static TemplateName
@@ -2226,6 +2225,7 @@
                                    SourceRange(TemplateLoc, RAngleLoc));
 
   // Substitute into the nested-name-specifier first, 
+  QualifierLoc = Param->getDefaultArgument().getTemplateQualifierLoc();
   if (QualifierLoc) {
     QualifierLoc = SemaRef.SubstNestedNameSpecifierLoc(QualifierLoc, 
                                                        AllTemplateArgs);
@@ -2233,7 +2233,7 @@
       return TemplateName();
   }
   
-  return SemaRef.SubstTemplateName(
+  return SemaRef.SubstTemplateName(QualifierLoc,
                       Param->getDefaultArgument().getArgument().getAsTemplate(),
                               Param->getDefaultArgument().getTemplateNameLoc(),
                                    AllTemplateArgs);
@@ -2286,8 +2286,7 @@
     return TemplateArgumentLoc();
 
 
-  NestedNameSpecifierLoc QualifierLoc
-    = TempTempParm->getDefaultArgument().getTemplateQualifierLoc();
+  NestedNameSpecifierLoc QualifierLoc;
   TemplateName TName = SubstDefaultTemplateArgument(*this, Template,
                                                     TemplateLoc,
                                                     RAngleLoc,
@@ -2679,8 +2678,7 @@
         break;
       }
 
-      NestedNameSpecifierLoc QualifierLoc
-        = TempParm->getDefaultArgument().getTemplateQualifierLoc();
+      NestedNameSpecifierLoc QualifierLoc;
       TemplateName Name = SubstDefaultTemplateArgument(*this, Template,
                                                        TemplateLoc,
                                                        RAngleLoc,