MS ABI: Correctly generate throw-info for pointer to const qual types
We didn't create type info based on the unqualified pointee type,
causing RTTI mismatches.
llvm-svn: 231533
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index 4e3d50b..9cb7d22 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -3367,7 +3367,7 @@
// - a standard pointer conversion (4.10) not involving conversions to
// pointers to private or protected or ambiguous classes
//
- // All pointers are convertible to void so ensure that it is in the
+ // All pointers are convertible to pointer-to-void so ensure that it is in the
// CatchableTypeArray.
if (IsPointer)
CatchableTypes.insert(getCatchableType(getContext().VoidPtrTy));
@@ -3398,6 +3398,8 @@
}
llvm::GlobalVariable *MicrosoftCXXABI::getThrowInfo(QualType T) {
+ T = getContext().getExceptionObjectType(T);
+
// C++14 [except.handle]p3:
// A handler is a match for an exception object of type E if [...]
// - the handler is of type cv T or const T& where T is a pointer type and
@@ -3409,7 +3411,17 @@
IsConst = PointeeType.isConstQualified();
IsVolatile = PointeeType.isVolatileQualified();
}
- T = getContext().getExceptionObjectType(T);
+
+ // Member pointer types like "const int A::*" are represented by having RTTI
+ // for "int A::*" and separately storing the const qualifier.
+ if (const auto *MPTy = T->getAs<MemberPointerType>())
+ T = getContext().getMemberPointerType(PointeeType.getUnqualifiedType(),
+ MPTy->getClass());
+
+ // Pointer types like "const int * const *" are represented by having RTTI
+ // for "const int **" and separately storing the const qualifier.
+ if (T->isPointerType())
+ T = getContext().getPointerType(PointeeType.getUnqualifiedType());
// The CatchableTypeArray enumerates the various (CV-unqualified) types that
// the exception object may be caught as.