2 files changed, 53 insertions, 23 deletions

diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index d0edb02a69..88e2e9425b 100644
--- a/lib/CodeGen/Mangle.cpp
+++ b/lib/CodeGen/Mangle.cpp
@@ -82,6 +82,7 @@ namespace {
                           const TemplateArgument *TemplateArgs,
                           unsigned NumTemplateArgs);
     void manglePrefix(const DeclContext *DC);
+    void mangleTemplatePrefix(const DeclContext *DC);
     void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity);
     void mangleCVQualifiers(unsigned Quals);
     void mangleType(QualType T);
@@ -265,17 +266,27 @@ void CXXNameMangler::mangleName(const NamedDecl *ND) {
   }
   
   if (DC->isTranslationUnit() || isStdNamespace(DC)) {
-    const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND);
-    if (FD && FD->getPrimaryTemplate()) 
-      mangleUnscopedTemplateName(FD);
-    else
-      mangleUnscopedName(ND);
-  } else if (isa<FunctionDecl>(DC))
+    // Check if we have a function template.
+    if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND)){
+      if (FD->getPrimaryTemplate()) {
+        mangleUnscopedTemplateName(FD);
+        mangleTemplateArgumentList(*FD->getTemplateSpecializationArgs());
+        return;
+      }
+    }
+
+    // FIXME: Check if we have a class template.
+    mangleUnscopedName(ND);
+    return;
+  }
+  
+  if (isa<FunctionDecl>(DC)) {
     mangleLocalName(ND);
-  else
-    mangleNestedName(ND);
+    return;
+  }
+  
+  mangleNestedName(ND);
 }
-
 void CXXNameMangler::mangleName(const TemplateDecl *TD, 
                                 const TemplateArgument *TemplateArgs,
                                 unsigned NumTemplateArgs) {
@@ -418,12 +429,6 @@ void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND) {
     assert(false && "Can't mangle a using directive name!");
     break;
   }
-
-  if (const FunctionDecl *Function = dyn_cast<FunctionDecl>(ND)) {
-    if (const TemplateArgumentList *TemplateArgs
-          = Function->getTemplateSpecializationArgs())
-      mangleTemplateArgumentList(*TemplateArgs);
-  }
 }
 
 void CXXNameMangler::mangleSourceName(const IdentifierInfo *II) {
@@ -436,15 +441,24 @@ void CXXNameMangler::mangleSourceName(const IdentifierInfo *II) {
 void CXXNameMangler::mangleNestedName(const NamedDecl *ND) {
   // <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
   //               ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
-  // FIXME: no template support
+  // FIXME: no class template support
   Out << 'N';
   if (const CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(ND))
     mangleCVQualifiers(Method->getTypeQualifiers());
-  manglePrefix(ND->getDeclContext());
-  mangleUnqualifiedName(ND);
+  
+  const FunctionDecl *FD = dyn_cast<FunctionDecl>(ND);
+  if (FD && FD->getPrimaryTemplate()) {
+    // FIXME: Call mangleTemplatePrefix.
+    manglePrefix(FD->getDeclContext());
+    mangleUnqualifiedName(FD);
+    mangleTemplateArgumentList(*FD->getTemplateSpecializationArgs());
+  } else {
+    manglePrefix(ND->getDeclContext());
+    mangleUnqualifiedName(ND);
+  }
+  
   Out << 'E';
 }
-
 void CXXNameMangler::mangleNestedName(const TemplateDecl *TD, 
                                       const TemplateArgument *TemplateArgs,
                                       unsigned NumTemplateArgs) {
@@ -476,7 +490,7 @@ void CXXNameMangler::manglePrefix(const DeclContext *DC) {
 
   if (mangleSubstitution(cast<NamedDecl>(DC)))
     return;
-  
+
   if (!DC->getParent()->isTranslationUnit())
     manglePrefix(DC->getParent());
 
@@ -493,6 +507,14 @@ void CXXNameMangler::manglePrefix(const DeclContext *DC) {
   addSubstitution(cast<NamedDecl>(DC));
 }
 
+void CXXNameMangler::mangleTemplatePrefix(const DeclContext *DC) {
+  // <template-prefix> ::= <prefix> <template unqualified-name>
+  //                   ::= <template-param>
+  //                   ::= <substitution>
+
+  // FIXME: Implement!
+}
+
 void
 CXXNameMangler::mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity) {
   switch (OO) {
diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp
index 2d2d4b5866..dd926b7251 100644
--- a/test/CodeGenCXX/mangle.cpp
+++ b/test/CodeGenCXX/mangle.cpp
@@ -95,9 +95,8 @@ template<typename T> void ft2(T t, void (*)(T), void (*)(T)) { }
 template<typename T, typename U = S1<T> > struct S4 { };
 template<typename T> void ft3(S4<T>*) {  }
 
-extern "C++" {
-  // CHECK: @_Z1hv
- void h() { } 
+namespace NS {
+  template<typename T> void ft1(T) { }
 }
 
 void g() {
@@ -109,4 +108,13 @@ void g() {
   
   // CHECK: @_Z3ft3IiEvP2S4IT_2S1IS1_EE
   ft3<int>(0);
+  
+  // CHECK: @_ZN2NS3ft1IiEEvT_
+  NS::ft1<int>(1);
+}
+
+extern "C++" {
+  // CHECK: @_Z1hv
+ void h() { } 
 }
+