From: David Majnemer <david.majnemer@gmail.com>
Date: Tue, 5 Aug 2014 06:42:40 +0000 (+0000)
Subject: MS ABI: Make the alias template mangling more correct
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca7ee4e3703d8dff0247376b305c5525383db946;p=clang

MS ABI: Make the alias template mangling more correct

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

diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index 0c80ff814c..7805ed5007 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -1187,7 +1187,7 @@ void MicrosoftCXXNameMangler::mangleTemplateArg(const TemplateDecl *TD,
     } else if (isa<TypeAliasDecl>(ND)) {
       // FIXME: The mangling, while compatible with VS "14", is horribly
       // broken.  Update this when they release their next compiler.
-      Out << '?';
+      Out << '$';
     } else {
       llvm_unreachable("unexpected template template NamedDecl!");
     }
diff --git a/test/CodeGenCXX/mangle-ms-cxx11.cpp b/test/CodeGenCXX/mangle-ms-cxx11.cpp
index cb9c64fc9a..8a528a6bfd 100644
--- a/test/CodeGenCXX/mangle-ms-cxx11.cpp
+++ b/test/CodeGenCXX/mangle-ms-cxx11.cpp
@@ -151,5 +151,5 @@ template <template <typename> class>
 void f() {}
 
 template void f<AliasA>();
-// CHECK-DAG: @"\01??$f@?@PR20047@@YAXXZ"
+// CHECK-DAG: @"\01??$f@$@PR20047@@YAXXZ"
 }