diff options
author | David Majnemer <david.majnemer@gmail.com> | 2014-02-06 10:59:19 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2014-02-06 10:59:19 +0000 |
commit | 595bf5c17f5f395d14c801b884d8569424cc34d0 (patch) | |
tree | 0f3e1760ee079f0f138c87955b721bf3ce68ac3b /lib/Sema/SemaCast.cpp | |
parent | a494d331c8edcca1e36eb31a95f8fa51a959021e (diff) |
MS ABI: Tweak pointer-to-member mangling/inheritance model selection
Properly determine the inheritance model when dealing with nullptr:
- If a nullptr template argument is being checked against
pointer-to-member parameter, nail down an inheritance model.
N.B. We will chose an inheritance model even if we won't ultimately
choose the template to instantiate! Cooky, right?
- Null pointer-to-datamembers have a virtual base table offset of -1,
not zero. Previously, we chose an offset of 0.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200920 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaCast.cpp')
-rw-r--r-- | lib/Sema/SemaCast.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Sema/SemaCast.cpp b/lib/Sema/SemaCast.cpp index 499e8b18be..5d49225ac4 100644 --- a/lib/Sema/SemaCast.cpp +++ b/lib/Sema/SemaCast.cpp @@ -1433,6 +1433,10 @@ TryStaticImplicitCast(Sema &Self, ExprResult &SrcExpr, QualType DestType, msg = 0; return TC_Failed; } + } else if (DestType->isMemberPointerType()) { + if (Self.Context.getTargetInfo().getCXXABI().isMicrosoft()) { + Self.RequireCompleteType(OpRange.getBegin(), DestType, 0); + } } InitializedEntity Entity = InitializedEntity::InitializeTemporary(DestType); |