more minor simplifications.

llvm-svn: 66214
This commit is contained in:
Chris Lattner 2009-03-05 23:03:49 +00:00
parent d26760aecb
commit 97e277e55e
1 changed files with 6 additions and 7 deletions

View File

@ -546,13 +546,14 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
Decl *Member;
if (isInstField) {
FieldDecl *FD =
HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D, BitWidth);
// Refresh our notion of bitwidth.
BitWidth = FD->getBitWidth();
Member = FD;
Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D, BitWidth);
assert(Member && "HandleField never returns null");
} else {
Member = static_cast<Decl*>(ActOnDeclarator(S, D, LastInGroup));
if (!Member) {
if (BitWidth) DeleteExpr(BitWidth);
return LastInGroup;
}
// Non-instance-fields can't have a bitfield.
if (BitWidth) {
@ -580,8 +581,6 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
}
}
if (!Member) return LastInGroup;
assert((Name || isInstField) && "No identifier for non-field ?");
// set/getAccess is not part of Decl's interface to avoid bloating it with C++