1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index 6429bd7c46..9b5fd74ad5 100644
--- a/lib/CodeGen/Mangle.cpp
+++ b/lib/CodeGen/Mangle.cpp
@@ -276,7 +276,11 @@ void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) {
 void CXXNameMangler::mangleUnscopedTemplateName(const FunctionDecl *FD) {
   //     <unscoped-template-name> ::= <unscoped-name>
   //                              ::= <substitution>
+  if (mangleSubstitution(FD))
+    return;
+  
   mangleUnscopedName(FD);
+  addSubstitution(FD);
 }
 
 void CXXNameMangler::mangleCalloffset(int64_t nv, int64_t v) {