Mangle std::basic_ostream<char, std::char_traits<char>> as So.

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

2 files changed, 28 insertions, 3 deletions

diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index aa017c9207..9468520592 100644
--- a/lib/CodeGen/Mangle.cpp
+++ b/lib/CodeGen/Mangle.cpp
@@ -1291,6 +1291,24 @@ bool CXXNameMangler::mangleStandardSubstitution(const NamedDecl *ND) {
       Out << "Ss";
       return true;
     }
+    
+    //    <substitution> ::= So # ::std::basic_ostream<char,  
+    //                            ::std::char_traits<char> >
+    if (SD->getIdentifier()->isStr("basic_ostream")) {
+      const TemplateArgumentList &TemplateArgs = SD->getTemplateArgs();
+      
+      if (TemplateArgs.size() != 2)
+        return false;
+      
+      if (!isCharType(TemplateArgs[0].getAsType()))
+        return false;
+      
+      if (!isCharSpecialization(TemplateArgs[1].getAsType(), "char_traits"))
+        return false;
+
+      Out << "So";
+      return true;
+    }
   }
   return false;
 }
diff --git a/test/CodeGenCXX/mangle-subst-std.cpp b/test/CodeGenCXX/mangle-subst-std.cpp
index 6a81c6d04b..fbce204512 100644
--- a/test/CodeGenCXX/mangle-subst-std.cpp
+++ b/test/CodeGenCXX/mangle-subst-std.cpp
@@ -9,24 +9,31 @@ namespace std {
 };
 
 namespace std {
-  template<typename T> struct allocator { };
+  template<typename> struct allocator { };
 }
 
 // CHECK: define void @_Z1fSaIcESaIiE
 void f(std::allocator<char>, std::allocator<int>) { }
 
 namespace std {
-  template<typename T, typename U, typename V> struct basic_string { };
+  template<typename, typename, typename> struct basic_string { };
 }
 
 // CHECK: define void @_Z1fSbIcciE
 void f(std::basic_string<char, char, int>) { }
 
 namespace std {
-  template<typename T> struct char_traits { };
+  template<typename> struct char_traits { };
   
   typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> > string;
 }
 
 // CHECK: _Z1fSs
 void f(std::string) { }
+
+namespace std {
+  template<typename, typename> struct basic_ostream { };
+}
+
+// CHECK: _Z1fSo
+void f(std::basic_ostream<char, std::char_traits<char> >) { }