commit e6258936178b4c52b43b3b9dbec13552961cd645
author Douglas Gregor <dgregor@apple.com> Thu Mar 19 00:39:20 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Thu Mar 19 00:39:20 2009 +0000
tree 4ca4bb163b6ec04f57e3e982bbe3396754e19d91
parent c20482b10ee4ffcea31f67392743ccdf6df1f7f4

Extend the use of QualifiedNameType to the creation of class template
specialization names. This way, we keep track of sugared types like

  std::vector<Real>

I believe we are now using QualifiedNameTypes everywhere we can. Next
step: QualifiedDeclRefExprs.



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

lib/Sema/Sema.h

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 5106a54..3755744 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -295,6 +295,8 @@
                               SourceRange Range2 = SourceRange(),
                               QualType PrintType = QualType());
 
+  QualType getQualifiedNameType(const CXXScopeSpec &SS, QualType T);
+
   //===--------------------------------------------------------------------===//
   // Symbol table / Decl tracking callbacks: SemaDecl.cpp.
   //

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 63d446f..483b79a 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -87,13 +87,8 @@
     } else
       return 0;
 
-    if (SS && SS->isNotEmpty() && SS->isSet()) {
-      llvm::SmallVector<NestedNameSpecifier, 4> TNNs;
-      for (CXXScopeSpec::iterator TNN = SS->begin(), TNNEnd = SS->end();
-           TNN != TNNEnd; ++TNN)
-        TNNs.push_back(NestedNameSpecifier::getFromOpaquePtr(*TNN));
-      T = Context.getQualifiedNameType(&TNNs[0], TNNs.size(), T);
-    }
+    if (SS)
+      T = getQualifiedNameType(*SS, T);
 
     return T.getAsOpaquePtr();
   }

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index f531778..b4e505e 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -765,6 +765,9 @@
                                          &TemplateArgs[0],
                                          TemplateArgs.size(),
                                          RAngleLoc);
+  
+  if (SS)
+    Result = getQualifiedNameType(*SS, Result);
 
   TemplateArgsIn.release();
   return Result.getAsOpaquePtr();
@@ -1910,11 +1913,12 @@
   // actually wrote the specialization, rather than formatting the
   // name based on the "canonical" representation used to store the
   // template arguments in the specialization.
-  Specialization->setTypeAsWritten(
-    Context.getClassTemplateSpecializationType(ClassTemplate, 
-                                               &TemplateArgs[0],
-                                               TemplateArgs.size(),
-                                  Context.getTypeDeclType(Specialization)));
+  QualType WrittenTy 
+    = Context.getClassTemplateSpecializationType(ClassTemplate, 
+                                                 &TemplateArgs[0],
+                                                 TemplateArgs.size(),
+                                  Context.getTypeDeclType(Specialization));
+  Specialization->setTypeAsWritten(getQualifiedNameType(SS, WrittenTy));
   TemplateArgsIn.release();
 
   // C++ [temp.expl.spec]p9:

lib/Sema/SemaType.cpp

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index a8be924..24b32e8 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -1077,3 +1077,16 @@
 
   return true;
 }
+
+/// \brief Retrieve a version of the type 'T' that is qualified by the
+/// nested-name-specifier contained in SS.
+QualType Sema::getQualifiedNameType(const CXXScopeSpec &SS, QualType T) {
+  if (!SS.isSet() || SS.isInvalid() || T.isNull())
+    return T;
+  
+  llvm::SmallVector<NestedNameSpecifier, 4> Specs;
+  for (CXXScopeSpec::iterator Spec = SS.begin(), SpecEnd = SS.end();
+       Spec != SpecEnd; ++Spec)
+    Specs.push_back(NestedNameSpecifier::getFromOpaquePtr(*Spec));
+  return Context.getQualifiedNameType(&Specs[0], Specs.size(), T);
+}