Fix for PR5659: correct a rather nasty oversight in the type conversion for

member pointer types.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90450 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 14 insertions, 4 deletions

diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index c89879fdb6..cd3575c132 100644
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -379,13 +379,13 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) {
     // If we ever want to support other ABIs this needs to be abstracted.
 
     QualType ETy = cast<MemberPointerType>(Ty).getPointeeType();
+    const llvm::Type *PtrDiffTy =
+        ConvertTypeRecursive(Context.getPointerDiffType());
     if (ETy->isFunctionType()) {
-      return llvm::StructType::get(TheModule.getContext(),
-                                   ConvertType(Context.getPointerDiffType()),
-                                   ConvertType(Context.getPointerDiffType()),
+      return llvm::StructType::get(TheModule.getContext(), PtrDiffTy, PtrDiffTy,
                                    NULL);
     } else
-      return ConvertType(Context.getPointerDiffType());
+      return PtrDiffTy;
   }
 
   case Type::TemplateSpecialization:
diff --git a/test/CodeGenCXX/member-pointer-type-convert.cpp b/test/CodeGenCXX/member-pointer-type-convert.cpp
new file mode 100644
index 0000000000..6969e0dd3e
--- /dev/null
+++ b/test/CodeGenCXX/member-pointer-type-convert.cpp
@@ -0,0 +1,10 @@
+// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+
+struct A;
+typedef int A::*param_t;
+struct {
+  const char *name;
+  param_t par;
+} *ptr;
+
+// CHECK: type { i8*, i32 }