1 files changed, 7 insertions, 2 deletions
diff --git a/lib/CodeGen/CGRtti.cpp b/lib/CodeGen/CGRtti.cpp
index c7044e5987..901c34a281 100644
--- a/lib/CodeGen/CGRtti.cpp
+++ b/lib/CodeGen/CGRtti.cpp
@@ -263,10 +263,13 @@ public:
     std::vector<llvm::Constant *> info;
 
     QualType PTy = Ty->getPointeeType();
-    // FIXME: ptr-mem data
     QualType BTy;
-    // FIXME: ptr-mem data
     bool PtrMem = false;
+    if (const MemberPointerType *MPT = dyn_cast<MemberPointerType>(Ty)) {
+      PtrMem = true;
+      BTy = QualType(MPT->getClass(), 0);
+      PTy = MPT->getPointeeType();
+    }
 
     if (PtrMem)
       C = BuildVtableRef("_ZTVN10__cxxabiv129__pointer_to_member_type_infoE");
@@ -335,6 +338,8 @@ public:
 
       return BuildPointerType(Ty);
     }
+    case Type::MemberPointer:
+      return BuildPointerType(Ty);
     }
   }
 };