diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-03-28 23:11:29 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-03-28 23:11:29 +0000 |
| commit | e93e2552e76ab704ec85919cc2c76f02b8b081ee (patch) | |
| tree | b58943f083aca29fa7f25d2337d4b8fcfcad3110 /lib | |
| parent | 4bbae38abf4145b81a3bf8658968fdaa2a8941c1 (diff) | |
[ms-cxxabi] Add more tests for r178297
This covers a few cases where the class of a member pointer is not a
CXXRecordDecl.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178307 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Sema/SemaType.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index 06004bd00c..136de7c221 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -1733,12 +1733,12 @@ QualType Sema::BuildMemberPointerType(QualType T, QualType Class, // when passing pointers between TUs that disagree about the size. if (Context.getTargetInfo().getCXXABI().isMicrosoft()) { CXXRecordDecl *RD = Class->getAsCXXRecordDecl(); - if (!RD || !RD->hasAttr<MSInheritanceAttr>()) { + if (RD && !RD->hasAttr<MSInheritanceAttr>()) { // Lock in the inheritance model on the first use of a member pointer. // Otherwise we may disagree about the size at different points in the TU. // FIXME: MSVC picks a model on the first use that needs to know the size, // rather than on the first mention of the type, e.g. typedefs. - if (RequireCompleteType(Loc, Class, 0) && RD && !RD->isBeingDefined()) { + if (RequireCompleteType(Loc, Class, 0) && !RD->isBeingDefined()) { // We know it doesn't have an attribute and it's incomplete, so use the // unspecified inheritance model. If we're in the record body, we can // figure out the inheritance model. |