diff options
author | Douglas Gregor <dgregor@apple.com> | 2011-11-01 22:13:30 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2011-11-01 22:13:30 +0000 |
commit | 5d8419c12a1ffaf710fa11fb1091f10f03f2c1dc (patch) | |
tree | 791f70d62a7c437a3af9e8bd539ba80a04b5ce3e /lib/Sema/SemaDecl.cpp | |
parent | 0b4072f42f4c94c6c396b43ed3db4d1deecef9c3 (diff) |
When we run into a constructor or destructor that is defined in the
wrong class, make sure to drop it immediately; we don't want that
constructor to be available within the DeclContext. Fixes
<rdar://problem/9677163>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143506 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
-rw-r--r-- | lib/Sema/SemaDecl.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 6bd0d25f75..806608cf43 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3233,13 +3233,23 @@ Decl *Sema::HandleDeclarator(Scope *S, Declarator &D, // class X { // void X::f(); // }; - if (CurContext->Equals(DC)) + if (CurContext->Equals(DC)) { Diag(D.getIdentifierLoc(), diag::warn_member_extra_qualification) << Name << FixItHint::CreateRemoval(D.getCXXScopeSpec().getRange()); - else + } else { Diag(D.getIdentifierLoc(), diag::err_member_qualification) << Name << D.getCXXScopeSpec().getRange(); - + + // C++ constructors and destructors with incorrect scopes can break + // our AST invariants by having the wrong underlying types. If + // that's the case, then drop this declaration entirely. + if ((Name.getNameKind() == DeclarationName::CXXConstructorName || + Name.getNameKind() == DeclarationName::CXXDestructorName) && + !Context.hasSameType(Name.getCXXNameType(), + Context.getTypeDeclType(cast<CXXRecordDecl>(CurContext)))) + return 0; + } + // Pretend that this qualifier was not here. D.getCXXScopeSpec().clear(); } |