replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure that we set the access specifier for an instantiated FieldDecl, and that the aggregate and POD flags for an instantiated class template are updated based on instantiation of a FieldDecl 

llvm-svn: 66701
This commit is contained in:
Douglas Gregor 2009-03-11 20:50:30 +00:00
parent 5202cc0036
commit 4261e4c363
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Sema/Sema.h
View File

@ -369,12 +369,13 @@ public:
Declarator &D, ExprTy *BitfieldWidth);
FieldDecl *HandleField(Scope *S, RecordDecl *TagD, SourceLocation DeclStart,
Declarator &D, Expr *BitfieldWidth);
Declarator &D, Expr *BitfieldWidth,
AccessSpecifier AS);
FieldDecl *CheckFieldDecl(DeclarationName Name, QualType T,
RecordDecl *Record, SourceLocation Loc,
bool Mutable, Expr *BitfieldWidth,
NamedDecl *PrevDecl,
AccessSpecifier AS, NamedDecl *PrevDecl,
Declarator *D = 0);
virtual DeclTy *ActOnIvar(Scope *S, SourceLocation DeclStart,

23
clang/lib/Sema/SemaDecl.cpp
View File

@ -3253,14 +3253,16 @@ Sema::DeclTy *Sema::ActOnField(Scope *S, DeclTy *TagD,
SourceLocation DeclStart,
Declarator &D, ExprTy *BitfieldWidth) {
return HandleField(S, static_cast<RecordDecl*>(TagD), DeclStart, D,
static_cast<Expr*>(BitfieldWidth));
static_cast<Expr*>(BitfieldWidth),
AS_public);
}
/// HandleField - Analyze a field of a C struct or a C++ data member.
///
FieldDecl *Sema::HandleField(Scope *S, RecordDecl *Record,
SourceLocation DeclStart,
Declarator &D, Expr *BitWidth) {
Declarator &D, Expr *BitWidth,
AccessSpecifier AS) {
IdentifierInfo *II = D.getIdentifier();
SourceLocation Loc = DeclStart;
if (II) Loc = D.getIdentifierLoc();
@ -3277,7 +3279,7 @@ FieldDecl *Sema::HandleField(Scope *S, RecordDecl *Record,
FieldDecl *NewFD
= CheckFieldDecl(II, T, Record, Loc,
D.getDeclSpec().getStorageClassSpec() == DeclSpec::SCS_mutable,
BitWidth, PrevDecl, &D);
BitWidth, AS, PrevDecl, &D);
if (NewFD->isInvalidDecl() && PrevDecl) {
// Don't introduce NewFD into scope; there's already something
// with the same name in the same scope.
@ -3302,7 +3304,7 @@ FieldDecl *Sema::HandleField(Scope *S, RecordDecl *Record,
FieldDecl *Sema::CheckFieldDecl(DeclarationName Name, QualType T,
RecordDecl *Record, SourceLocation Loc,
bool Mutable, Expr *BitWidth,
NamedDecl *PrevDecl,
AccessSpecifier AS, NamedDecl *PrevDecl,
Declarator *D) {
IdentifierInfo *II = Name.getAsIdentifierInfo();
bool InvalidDecl = false;
@ -3364,6 +3366,19 @@ FieldDecl *Sema::CheckFieldDecl(DeclarationName Name, QualType T,
if (InvalidDecl)
NewFD->setInvalidDecl();
NewFD->setAccess(AS);
// C++ [dcl.init.aggr]p1:
// An aggregate is an array or a class (clause 9) with [...] no
// private or protected non-static data members (clause 11).
// A POD must be an aggregate.
if (getLangOptions().CPlusPlus &&
(AS == AS_private || AS == AS_protected)) {
CXXRecordDecl *CXXRecord = cast<CXXRecordDecl>(Record);
CXXRecord->setAggregate(false);
CXXRecord->setPOD(false);
}
return NewFD;
}

17
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -547,7 +547,8 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
Decl *Member;
if (isInstField) {
Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D, BitWidth);
Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D, BitWidth,
AS);
assert(Member && "HandleField never returns null");
} else {
Member = static_cast<Decl*>(ActOnDeclarator(S, D, LastInGroup));
@ -581,22 +582,12 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
BitWidth = 0;
Member->setInvalidDecl();
}
Member->setAccess(AS);
}
assert((Name || isInstField) && "No identifier for non-field ?");
Member->setAccess(AS);
// C++ [dcl.init.aggr]p1:
// An aggregate is an array or a class (clause 9) with [...] no
// private or protected non-static data members (clause 11).
// A POD must be an aggregate.
if (isInstField && (AS == AS_private || AS == AS_protected)) {
CXXRecordDecl *Record = cast<CXXRecordDecl>(CurContext);
Record->setAggregate(false);
Record->setPOD(false);
}
if (DS.isVirtualSpecified()) {
if (!isFunc || DS.getStorageClassSpec() == DeclSpec::SCS_static) {
Diag(DS.getVirtualSpecLoc(), diag::err_virtual_non_function);

1
clang/lib/Sema/SemaTemplateInstantiate.cpp
View File

@ -718,6 +718,7 @@ Sema::InstantiateClassTemplateSpecialization(
Field->getLocation(),
Field->isMutable(),
Field->getBitWidth(),
Field->getAccess(),
0);
if (New) {
ClassTemplateSpec->addDecl(New);