diff options
| -rw-r--r-- | lib/CodeGen/TargetInfo.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGenCXX/x86_64-arguments.cpp | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 176a7432b0..4a0a298c3b 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -853,6 +853,11 @@ void X86_64ABIInfo::classify(QualType Ty, classify(ET->getDecl()->getIntegerType(), Context, OffsetBase, Lo, Hi); } else if (Ty->hasPointerRepresentation()) { Current = Integer; + } else if (Ty->isMemberPointerType()) { + if (Ty->isMemberFunctionPointerType()) + Lo = Hi = Integer; + else + Current = Integer; } else if (const VectorType *VT = Ty->getAs<VectorType>()) { uint64_t Size = Context.getTypeSize(VT); if (Size == 32) { diff --git a/test/CodeGenCXX/x86_64-arguments.cpp b/test/CodeGenCXX/x86_64-arguments.cpp index 7ebbedc998..4bc83b8513 100644 --- a/test/CodeGenCXX/x86_64-arguments.cpp +++ b/test/CodeGenCXX/x86_64-arguments.cpp @@ -25,3 +25,11 @@ void f2(f2_s1 a0) { } struct s3_0 {}; struct s3_1 { struct s3_0 a; long b; }; void f3(struct s3_1 x) {} + +// CHECK: define i64 @_Z4f4_0M2s4i(i64) +// CHECK: define [[i64_i64_ty]] @_Z4f4_1M2s4FivE([[i64_i64_ty]]) +struct s4 {}; +typedef int s4::* s4_mdp; +typedef int (s4::*s4_mfp)(); +s4_mdp f4_0(s4_mdp a) { return a; } +s4_mfp f4_1(s4_mfp a) { return a; } |