There was a follow-on commit, r<font><span style="background-color:rgba(255,255,255,0)">205945, which addressed this.<span></span></span></font><br><br>On Thursday, April 10, 2014, Sean Silva <<a href="mailto:chisophugis@gmail.com">chisophugis@gmail.com</a>> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'm seeing some non-ascii chars in:<div><br></div><div><span style="font-family:arial,sans-serif;font-size:13px">+  // Proposal by cxx-abi-dev, 2014-03-26</span><br style="font-family:arial,sans-serif;font-size:13px">

<span style="font-family:arial,sans-serif;font-size:13px">+  // <class-enum-type> ::= <name>    # non-dependent or dependent type name or</span><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">+  //                                 # dependent elaborated type specifier using</span><br style="font-family:arial,sans-serif;font-size:13px">

<span style="font-family:arial,sans-serif;font-size:13px">+  //                                 # â€˜typename'</span><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">+  //                   ::= Ts <name> # dependent elaborated type specifier using</span><br style="font-family:arial,sans-serif;font-size:13px">

<span style="font-family:arial,sans-serif;font-size:13px">+  //                                 # â€˜struct’ or â€˜class'</span><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">+  //                   ::= Tu <name> # dependent elaborated type specifier using</span><br style="font-family:arial,sans-serif;font-size:13px">

<span style="font-family:arial,sans-serif;font-size:13px">+  //                                 # â€˜union'</span><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">+  //                   ::= Te <name> # dependent elaborated type specifier using</span><br style="font-family:arial,sans-serif;font-size:13px">

<span style="font-family:arial,sans-serif;font-size:13px">+  //                                 # â€˜enum’</span><br></div></div><div><br><br><div>On Wed, Apr 9, 2014 at 8:49 PM, David Majnemer <span dir="ltr"><<a>david.majnemer@gmail.com</a>></span> wrote:<br>

<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Wed Apr  9 19:49:24 2014<br>
New Revision: 205943<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=205943&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=205943&view=rev</a><br>
Log:<br>
AST: Implement proposal for dependent elaborated type specifiers<br>
<br>
cxx-abi-dev came up with a way to disambiguate between different<br>
keywords used in elaborated type specifiers.<br>
<br>
This resolves certain collisions during mangling.<br>
<br>
Modified:<br>
    cfe/trunk/lib/AST/ItaniumMangle.cpp<br>
    cfe/trunk/test/CodeGenCXX/mangle.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/ItaniumMangle.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ItaniumMangle.cpp?rev=205943&r1=205942&r2=205943&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ItaniumMangle.cpp?rev=205943&r1=205942&r2=205943&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/lib/AST/ItaniumMangle.cpp (original)<br>
+++ cfe/trunk/lib/AST/ItaniumMangle.cpp Wed Apr  9 19:49:24 2014<br>
@@ -2361,8 +2361,35 @@ void CXXNameMangler::mangleType(const Te<br>
 void CXXNameMangler::mangleType(const DependentNameType *T) {<br>
   // Typename types are always nested<br>
   Out << 'N';<br>
+  // Proposal by cxx-abi-dev, 2014-03-26<br>
+  // <class-enum-type> ::= <name>    # non-dependent or dependent type name or<br>
+  //                                 # dependent elaborated type specifier using<br>
+  //                                 # â€˜typename'<br>
+  //                   ::= Ts <name> # dependent elaborated type specifier using<br>
+  //                                 # â€˜struct’ or â€˜class'<br>
+  //                   ::= Tu <name> # dependent elaborated type specifier using<br>
+  //                                 # â€˜union'<br>
+  //                   ::= Te <name> # dependent elaborated type specifier using<br>
+  //                                 # â€˜enum’<br>
+  switch (T->getKeyword()) {<br>
+    case ETK_Typename:<br>
+      break;<br>
+    case ETK_Struct:<br>
+    case ETK_Class:<br>
+    case ETK_Interface:<br>
+      Out << "Ts";<br>
+      break;<br>
+    case ETK_Union:<br>
+      Out << "Tu";<br>
+      break;<br>
+    case ETK_Enum:<br>
+      Out << "Te";<br>
+      break;<br>
+    default:<br>
+      llvm_unreachable("unexpected keyword for dependent type name");<br>
+  }<br>
   manglePrefix(T->getQualifier());<br>
-  mangleSourceName(T->getIdentifier());<br>
+  mangleSourceName(T->getIdentifier());<br>
   Out << 'E';<br>
 }<br>
<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/mangle.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle.cpp?rev=205943&r1=205942&r2=205943&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle.cpp?rev=205943&r1=205942&r2=205943&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/mangle.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/mangle.cpp Wed Apr  9 19:49:24 2014<br>
@@ -951,3 +951,43 @@ namespace test44 {<br>
   }<br>
   // CHECK-LABEL: define linkonce_odr void @_ZN6test443foo3barEv(%"struct.test44::foo"* %this)<br>
 }<br>
+<br>
+namespace test45 {<br>
+  struct S {<br>
+    enum e {};<br>
+  };<br>
+  template <typename T><br>
+  void f(enum T::e *) {}<br>
+  template void f<S>(S::e *);<br>
+  // CHECK-LABEL: define weak_odr void @_ZN6test451fINS_1SEEEvPNTeT_1eE(i32*)<br>
+}<br>
+<br>
+namespace test46 {<br>
+  struct S {<br>
+    struct s {};<br>
+  };<br>
+  template <typename T><br>
+  void f(struct T::s *) {}<br>
+  template void f<S>(S::s *);<br>
+  // CHECK-LABEL: define weak_odr void @_ZN6test461fINS_1SEEEvPNTsT_1sE(%"struct.test46::S::s"*)<br>
+}<br>
+<br>
+namespace test47 {<br>
+  struct S {<br>
+    class c {};<br>
+  };<br>
+  template <typename T><br>
+  void f(class T::c *) {}<br>
+  template void f<S>(S::c *);<br>
+  // CHECK-LABEL: define weak_odr void @_ZN6test471fINS_1SEEEvPNTsT_1cE(%"class.test47::S::c"*)<br>
+}<br>
+<br>
+namespace test48 {<br>
+  struct S {<br>
+    union u {};<br>
+  };<br>
+  template <typename T><br>
+  void f(union T::u *) {}<br>
+  template void f<S>(S::</blockquote></div></div></blockquote>