summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGCXXABI.h
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-08-07 22:56:13 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-08-07 22:56:13 +0000
commitb3e5654923e074b7f5ebb1e7c54519e2911a06f7 (patch)
treeb6f2c6de7d7d641d4722824956f5e8cb179dd39b /clang/lib/CodeGen/CGCXXABI.h
parent76e8af88b8b4ea8c3381dc5730b27ac6df18bac7 (diff)
downloadbcm5719-llvm-b3e5654923e074b7f5ebb1e7c54519e2911a06f7.tar.gz
bcm5719-llvm-b3e5654923e074b7f5ebb1e7c54519e2911a06f7.zip
MS ABI: Handle member function pointers returning a member data pointer
MSVC doesn't decide what the inheritance model for a returned member pointer *until* a call expression returns it. This fixes PR20017. llvm-svn: 215164
Diffstat (limited to 'clang/lib/CodeGen/CGCXXABI.h')
-rw-r--r--clang/lib/CodeGen/CGCXXABI.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGCXXABI.h b/clang/lib/CodeGen/CGCXXABI.h
index 91e49707bae..40418b60c1b 100644
--- a/clang/lib/CodeGen/CGCXXABI.h
+++ b/clang/lib/CodeGen/CGCXXABI.h
@@ -156,6 +156,11 @@ public:
/// (in the C++ sense) with an LLVM zeroinitializer.
virtual bool isZeroInitializable(const MemberPointerType *MPT);
+ /// Return whether or not a member pointers type is convertible to an IR type.
+ virtual bool isMemberPointerConvertible(const MemberPointerType *MPT) const {
+ return true;
+ }
+
/// Create a null member pointer of the given type.
virtual llvm::Constant *EmitNullMemberPointer(const MemberPointerType *MPT);
OpenPOWER on IntegriCloud