[ms-cxxabi] Properly mangle member pointers
There were three things missing from the original implementation:
- We would omit the 'E' qualifier for members int 64-bit mode.
- We would not exmaine the qualifiers in 'IsMember' mode.
- We didn't generate the correct backref to the base class.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187753 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index fb3f87a..8d7b76d 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -329,7 +329,11 @@
mangleQualifiers(Ty.getQualifiers(), false);
} else {
mangleType(Ty, TL.getSourceRange(), QMM_Drop);
- mangleQualifiers(Ty.getLocalQualifiers(), false);
+ mangleQualifiers(Ty.getLocalQualifiers(), Ty->isMemberPointerType());
+ // Member pointers are suffixed with a back reference to the member
+ // pointer's class name.
+ if (const MemberPointerType *MPT = Ty->getAs<MemberPointerType>())
+ mangleName(MPT->getClass()->getAsCXXRecordDecl());
}
}
@@ -978,6 +982,7 @@
// ::= 5 # not really based
bool HasConst = Quals.hasConst(),
HasVolatile = Quals.hasVolatile();
+
if (!IsMember) {
if (HasConst && HasVolatile) {
Out << 'D';
@@ -989,6 +994,9 @@
Out << 'A';
}
} else {
+ if (PointersAre64Bit)
+ Out << 'E';
+
if (HasConst && HasVolatile) {
Out << 'T';
} else if (HasVolatile) {