Substitute "::std::" as "St".
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82874 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index e07c38f..c07d903 100644
--- a/lib/CodeGen/Mangle.cpp
+++ b/lib/CodeGen/Mangle.cpp
@@ -59,6 +59,8 @@
bool mangleSubstitution(QualType T);
bool mangleSubstitution(uintptr_t Ptr);
+ bool mangleStandardSubstitution(const NamedDecl *ND);
+
void addSubstitution(const NamedDecl *ND) {
addSubstitution(reinterpret_cast<uintptr_t>(ND));
}
@@ -1070,8 +1072,11 @@
// <substitution> ::= S <seq-id> _
// ::= S_
-
bool CXXNameMangler::mangleSubstitution(const NamedDecl *ND) {
+ // Try one of the standard substitutions first.
+ if (mangleStandardSubstitution(ND))
+ return true;
+
return mangleSubstitution(reinterpret_cast<uintptr_t>(ND));
}
@@ -1120,6 +1125,22 @@
return true;
}
+bool CXXNameMangler::mangleStandardSubstitution(const NamedDecl *ND) {
+ // <substitution> ::= St # ::std::
+
+ const NamespaceDecl *NS = dyn_cast<NamespaceDecl>(ND);
+ if (!NS)
+ return false;
+ if (!NS->getParent()->isTranslationUnit())
+ return false;
+
+ if (!NS->getOriginalNamespace()->getIdentifier()->isStr("std"))
+ return false;
+
+ Out << "St";
+ return true;
+}
+
void CXXNameMangler::addSubstitution(QualType T) {
if (!T.getCVRQualifiers()) {
if (const RecordType *RT = T->getAs<RecordType>()) {